Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3c3250a6c301
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59fecb261cbb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 27, 2016

  1. Recognize Android java.version 

    This change enables JOpenSSL on Android.  Android has roughly Java 1.7 API.
    @donv
    donv committed Jan 27, 2016
    Copy the full SHA
    00dbb23 View commit details

  2. Merge pull request #81 from donv/patch-1 

    Recognize Android java.version
    @kares
    kares committed Jan 27, 2016
    Copy the full SHA
    59fecb2 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 src/main/java/org/jruby/ext/openssl/OpenSSL.java
8 changes: 7 additions & 1 deletion src/main/java/org/jruby/ext/openssl/OpenSSL.java
View file
Original file line number Diff line number Diff line change
@@ -234,7 +234,13 @@ static void warn(final ThreadContext context, final IRubyObject msg) {
}

private static String javaVersion(final String def) {
return SafePropertyAccessor.getProperty("java.version", def);
final String javaVersionProperty =
SafePropertyAccessor.getProperty("java.version", def);
if (javaVersionProperty == "0") { // Android
return "1.7.0";
} else {
return javaVersionProperty;
}
}

static boolean javaVersion7(final boolean atLeast) {