jruby · Mar 30, 2016 · Mar 30, 2016 · Mar 30, 2016
Showing with 24 additions and 11 deletions.

+1 −1 lib/jopenssl/version.rb

+1 −1 pom.xml

+2 −5 src/main/java/org/jruby/ext/openssl/OpenSSL.java

+20 −4 src/main/java/org/jruby/ext/openssl/SSLSession.java
diff --git a/lib/jopenssl/version.rb b/lib/jopenssl/version.rb
@@ -1,5 +1,5 @@
 module Jopenssl
-  VERSION = '0.9.17'
+  VERSION = '0.9.17.dev'
   BOUNCY_CASTLE_VERSION = '1.54'
   # @deprecated
   module Version

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>jruby-openssl</artifactId>
-  <version>0.9.17</version>
+  <version>0.9.17.dev-SNAPSHOT</version>
   <packaging>gem</packaging>
   <name>JRuby OpenSSL</name>
   <description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>

diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSL.java b/src/main/java/org/jruby/ext/openssl/OpenSSL.java
@@ -236,11 +236,8 @@ static void warn(final ThreadContext context, final IRubyObject msg) {
     private static String javaVersion(final String def) {
         final String javaVersionProperty =
                 SafePropertyAccessor.getProperty("java.version", def);
-        if (javaVersionProperty == "0") { // Android
-            return "1.7.0";
-        } else {
-            return javaVersionProperty;
-        }
+        if ( javaVersionProperty == "0" ) return "1.7.0"; // Android
+        return javaVersionProperty;
     }
 
     static boolean javaVersion7(final boolean atLeast) {

diff --git a/src/main/java/org/jruby/ext/openssl/SSLSession.java b/src/main/java/org/jruby/ext/openssl/SSLSession.java
@@ -28,7 +28,9 @@
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.RubyTime;
@@ -96,15 +98,30 @@ final javax.net.ssl.SSLSession sslSession() {
 
     @JRubyMethod(name = "==")
     public IRubyObject op_eqq(final ThreadContext context, final IRubyObject other) {
+        return context.runtime.newBoolean( equals(other) );
+    }
+
+    @Override
+    public boolean equals(final Object other) {
         if ( other instanceof SSLSession ) {
             final SSLSession that = (SSLSession) other;
             if ( this.sslSession.getProtocol().equals( that.sslSession.getProtocol() ) ) {
                 if ( Arrays.equals( this.sslSession.getId(), that.sslSession.getId() ) ) {
-                    return context.runtime.getTrue();
+                    return true;
                 }
             }
         }
-        return context.runtime.getFalse();
+        return false;
+    }
+
+    @Override
+    public final int hashCode() {
+        return 17 * sslSession.hashCode();
+    }
+
+    @Override
+    public RubyFixnum hash() {
+        return getRuntime().newFixnum(hashCode());
     }
 
     @JRubyMethod(name = "id")
@@ -146,8 +163,7 @@ public IRubyObject set_timeout(final ThreadContext context, IRubyObject timeout)
             warn(context, "WARNING: can not set Session#timeout=("+ timeout +") no session context");
             return context.nil;
         }
-        final long t = timeout.convertToInteger().getLongValue();
-        sessionContext.setSessionTimeout((int) t); // in seconds as well
+        sessionContext.setSessionTimeout(RubyNumeric.fix2int(timeout)); // in seconds as well
         return timeout;
     }