better jruby.home detection on IBM WAS

Signed-off-by: Hiro Asari <[email protected]>
komax · Mar 24, 2012 · bec227e · bec227e
1 parent 43e91dd
commit bec227e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/org/jruby/embed/util/SystemPropertyCatcher.java b/src/org/jruby/embed/util/SystemPropertyCatcher.java
@@ -209,7 +209,11 @@ public static String findJRubyHome(Object instance) {
     public static String findFromJar(Object instance) {
         URL resource = instance.getClass().getResource("/META-INF/jruby.home");
         if (resource == null) {
-            return null;
+            // on IBM WebSphere getResource for a dir returns null but an actual
+            // file if it's there returns e.g. wsjar:file:/opt/IBM/WebSphere/...
+            // .../jruby-stdlib-1.6.7.dev.jar!/META-INF/jruby.home/bin/jrubyc
+            resource = instance.getClass().getResource("/META-INF/jruby.home/bin/jrubyc");
+            if (resource == null) return null;
         }
 
         String location = null;