Merge pull request #81 from donv/patch-1

kares · kares · commit 59fecb261cbb · 2016-01-27T12:54:17.000+01:00
Recognize Android java.version
diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSL.java b/src/main/java/org/jruby/ext/openssl/OpenSSL.java
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,13 @@ static void warn(final ThreadContext context, final IRubyObject msg) {`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`private static String javaVersion(final String def) {`
`237`		`- return SafePropertyAccessor.getProperty("java.version", def);`
	`237`	`+ final String javaVersionProperty =`
	`238`	`+ SafePropertyAccessor.getProperty("java.version", def);`
	`239`	`+ if (javaVersionProperty == "0") { // Android`
	`240`	`+ return "1.7.0";`
	`241`	`+ } else {`
	`242`	`+ return javaVersionProperty;`
	`243`	`+ }`
`238`	`244`	`}`
`239`	`245`
`240`	`246`	`static boolean javaVersion7(final boolean atLeast) {`