From 00dbb23937e468ef0d83456e53b87ea3e47766b2 Mon Sep 17 00:00:00 2001 From: Uwe Kubosch Date: Wed, 27 Jan 2016 12:51:20 +0100 Subject: [PATCH] Recognize Android java.version This change enables JOpenSSL on Android. Android has roughly Java 1.7 API. --- src/main/java/org/jruby/ext/openssl/OpenSSL.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSL.java b/src/main/java/org/jruby/ext/openssl/OpenSSL.java index ca87188e..3a8edd38 100644 --- 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) {