context-loader rackup script resolution should work also when rackup.path configured

closes #191 as merged

Author: kares

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

@@ -15,7 +15,6 @@
 import java.lang.reflect.Method;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -501,23 +500,34 @@ private String findConfigRuPathInSubDirectories(final String path, int level) {
 
             if (level > 0) {
                 level--;
-                for ( Iterator<String> i = entries.iterator(); i.hasNext(); ) {
-                    String subpath = i.next();
-                    if (subpath.endsWith("/")) {
+                for ( String subpath : entries ) {
+                    final int len = subpath.length();
+                    if ( len > 0 && subpath.charAt(len - 1) == '/' ) {
                         subpath = findConfigRuPathInSubDirectories(subpath, level);
-                        if (subpath != null) {
-                            return subpath;
-                        }
+                        if ( subpath != null ) return subpath;
                     }
                 }
             }
         }
         return null;
     }
 
-    private String resolveRackupScript() throws RackInitializationException {
-        rackupLocation = "<web.xml>";
+    private static String getContextLoaderScript(final String name, final boolean silent)
+        throws IOException {
+        try { // still try context-loader for resolving rackup :
+            final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
+            InputStream is = contextLoader.getResourceAsStream(name);
+            return IOHelpers.inputStreamToString(is);
+        }
+        catch (IOException e) {
+            if ( silent ) return null; throw e;
+        }
+        catch (RuntimeException e) {
+            if ( silent ) return null; throw e;
+        }
+    }
 
+    private String resolveRackupScript() throws RackInitializationException {
         String rackup = rackContext.getConfig().getRackup();
         if (rackup == null) {
             rackup = rackContext.getConfig().getRackupPath();
@@ -533,23 +543,40 @@ private String resolveRackupScript() throws RackInitializationException {
                 }
             }
 
-            InputStream is = null;
-            try {
-                if (rackup != null) {
+            if (rackup != null) {
+                InputStream is;
+                try {
                     is = rackContext.getResourceAsStream(rackup);
                     rackupLocation = rackContext.getRealPath(rackup);
+                    return this.rackupScript = IOHelpers.inputStreamToString(is);
                 }
-                else {
-                    is = Thread.currentThread().getContextClassLoader().getResourceAsStream("config.ru");
-                    rackupLocation = "uri:classloader://config.ru";
+                catch (IOException e) {
+                    try { // last - try context-loader for resolving rackup :
+                        if ( (rackup = getContextLoaderScript(rackup, true)) != null ) {
+                            return this.rackupScript = rackup;
+                        }
+                    }
+                    catch (IOException ex) { /* won't happen */ }
+
+                    rackContext.log(RackLogger.ERROR, "failed to read rackup from '"+ rackup + "' (" + e + ")");
+                    throw new RackInitializationException("failed to read rackup input", e);
                 }
-                rackup = IOHelpers.inputStreamToString(is);
             }
-            catch (IOException e) {
-                rackContext.log(RackLogger.ERROR, "failed to read rackup from '"+ rackup + "' (" + e + ")");
-                throw new RackInitializationException("failed to read rackup input", e);
+            else {
+                rackup = "config.ru";
+                try {
+                    rackup = getContextLoaderScript(rackup, false);
+                    rackupLocation = "uri:classloader://config.ru";
+                }
+                catch (IOException e) {
+                    rackContext.log(RackLogger.ERROR, "failed to read rackup from '"+ rackup + "' (" + e + ")");
+                    throw new RackInitializationException("failed to read rackup input", e);
+                }
             }
         }
+        else {
+            rackupLocation = "<web.xml>";
+        }
 
         return this.rackupScript = rackup;
     }