jruby · Oct 29, 2017 · Oct 29, 2017
diff --git a/src/main/java/org/jruby/ext/openssl/BouncyCastlePEMHandler.java b/src/main/java/org/jruby/ext/openssl/BouncyCastlePEMHandler.java
diff --git a/src/main/java/org/jruby/ext/openssl/DefaultPEMHandler.java b/src/main/java/org/jruby/ext/openssl/DefaultPEMHandler.java
diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSLImpl.java b/src/main/java/org/jruby/ext/openssl/OpenSSLImpl.java
diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSLReal.java b/src/main/java/org/jruby/ext/openssl/OpenSSLReal.java
@@ -41,12 +41,12 @@ public class OpenSSLReal {
     private OpenSSLReal() { /* no instances */ }
 
     @Deprecated
-    public static interface Runnable {
-        public void run() throws GeneralSecurityException;
+    public interface Runnable {
+        void run() throws GeneralSecurityException;
     }
 
-    public static interface Callable<T> {
-        public T call() throws GeneralSecurityException;
+    public interface Callable<T> {
+        T call() throws GeneralSecurityException;
     }
 
     /**

diff --git a/src/main/java/org/jruby/ext/openssl/PEMHandler.java b/src/main/java/org/jruby/ext/openssl/PEMHandler.java
diff --git a/src/main/java/org/jruby/ext/openssl/StringHelper.java b/src/main/java/org/jruby/ext/openssl/StringHelper.java
@@ -62,14 +62,8 @@ static RubyString newString(final Ruby runtime, final byte[] bytes, final int co
     }
 
     static ByteList setByteListShared(final RubyString str) {
-        try {
-            str.setByteListShared();
-            return str.getByteList();
-        }
-        catch (NoSuchMethodError err) { // JRuby 1.6
-            RubyString dup = (RubyString) str.dup();
-            return dup.getByteList();
-        }
+        str.setByteListShared();
+        return str.getByteList();
     }
 
     static RubyString newUTF8String(final Ruby runtime, final ByteList bytes) {