avoid using JRuby IO APIs (will likely not work in 9k)

jruby · Jul 8, 2014 · f54b3bc · f54b3bc
1 parent 9513115
commit f54b3bc
Showing 1 changed file with 1 addition and 20 deletions.
diff --git a/src/main/java/org/jruby/ext/openssl/x509store/Lookup.java b/src/main/java/org/jruby/ext/openssl/x509store/Lookup.java
@@ -50,11 +50,6 @@
 
 import org.jruby.Ruby;
 import org.jruby.RubyHash;
-import org.jruby.util.io.ChannelDescriptor;
-import org.jruby.util.io.ChannelStream;
-import org.jruby.util.io.FileExistsException;
-import org.jruby.util.io.InvalidValueException;
-import org.jruby.util.io.ModeFlags;
 
 import org.jruby.ext.openssl.SecurityHelper;
 
@@ -294,21 +289,7 @@ public int loadDefaultJavaCACertsFile() throws Exception {
     }
 
     private InputStream wrapJRubyNormalizedInputStream(String file) throws IOException {
-        Ruby runtime = Ruby.getGlobalRuntime();
-        try {
-            ChannelDescriptor descriptor = ChannelDescriptor.open(runtime.getCurrentDirectory(), file, new ModeFlags(ModeFlags.RDONLY));
-            return ChannelStream.open(runtime, descriptor).newInputStream();
-        } catch (NoSuchMethodError nsme) {
-            return new BufferedInputStream(new FileInputStream(file));
-        } catch (FileExistsException fee) {
-            // should not happen because ModeFlag does not contain CREAT.
-            fee.printStackTrace(System.err);
-            throw new IllegalStateException(fee.getMessage(), fee);
-        } catch (InvalidValueException ive) {
-            // should not happen because ModeFlasg does not contain APPEND.
-            ive.printStackTrace(System.err);
-            throw new IllegalStateException(ive.getMessage(), ive);
-        }
+        return new BufferedInputStream(new FileInputStream(file));
     }
 
     /**