jruby · Oct 5, 2014 · Oct 5, 2014 · Oct 5, 2014 · Oct 5, 2014
diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -333,7 +333,7 @@ private String calculateJRubyHome() {
             newJRubyHome = verifyHome(newJRubyHome, error);
         } else {
             try {
-                newJRubyHome = SystemPropertyCatcher.findFromJar(this);
+                newJRubyHome = SystemPropertyCatcher.findJRubyHome(this);
             } catch (Exception e) {}
 
             if (newJRubyHome != null) {

diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -229,7 +229,15 @@ private static FileResource createRegularURI(String pathname) {
             return new URLResource(URI + pathname, (URL)null, files);
         }
         try {
-            url.openStream().close();
+            InputStream is = url.openStream();
+            // no inputstream happens with knoplerfish OSGI and osgi tests from /maven/jruby-complete
+            if (is != null) {
+                is.close();
+            }
+            else {
+                // there is no input-stream from this url
+                url = null;
+            }
             return new URLResource(URI + pathname, url, null);
         }
         catch (IOException e)
@@ -294,7 +302,14 @@ private static String[] listFiles(String pathname) {
         try
         {
             // TODO remove this replace
-            return listFilesFromInputStream(new URL(pathname.replace("file://", "file:/") + "/.jrubydir").openStream());
+            InputStream is = new URL(pathname.replace("file://", "file:/") + "/.jrubydir").openStream();
+            // no inputstream happens with knoplerfish OSGI and osgi tests from /maven/jruby-complete
+            if (is != null) {
+                return listFilesFromInputStream(is);
+            }
+            else {
+                return null;
+            }
         }
         catch (IOException e)
         {

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -29,7 +29,7 @@ def version
 # the versions are declared in ../pom.xml
 default_gems =
   [
-   ImportedGem.new( 'jruby-openssl', '0.9.6.dev-SNAPSHOT', true ),
+   ImportedGem.new( 'jruby-openssl', '0.9.5', true ),
    ImportedGem.new( 'rake', 'rake.version', true ),
    ImportedGem.new( 'rdoc', 'rdoc.version', true, false, true ),
    ImportedGem.new( 'json', 'json.version', true, false ),

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.9.6.dev-SNAPSHOT</version>
+      <version>0.9.5</version>
       <type>gem</type>
     </dependency>
     <dependency>

diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
@@ -53,7 +53,7 @@
   execute 'setup other osgi frameworks', :phase => 'pre-integration-test' do |ctx|
     require 'fileutils'
     source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_many_bundles_with_embedded_gems' )
-    [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4' ].each do |m|
+    [ 'knoplerfish', 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4' ].each do |m|
       target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_many_bundles_with_embedded_gems_' + m )
       FileUtils.cp_r( source, target )
       File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|

diff --git a/maven/jruby/pom.rb b/maven/jruby/pom.rb
@@ -36,7 +36,7 @@
 
   execute 'setup other osgi frameworks', :phase => 'pre-integration-test' do |ctx|
     source = File.join( ctx.basedir.to_pathname, 'src', 'templates', 'osgi_all_inclusive' )
-     [ 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4'].each do |m|
+     [ 'knoplerfish', 'equinox-3.6', 'equinox-3.7', 'felix-3.2', 'felix-4.4'].each do |m|
       target = File.join( ctx.basedir.to_pathname, 'src', 'it', 'osgi_all_inclusive_' + m )
       FileUtils.cp_r( source, target )
       File.open( File.join( target, 'invoker.properties' ), 'w' ) do |f|

diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb.new b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb.new