Try a fix where the local file option is the last resort.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1621 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/common/ShibResource.java b/src/edu/internet2/middleware/shibboleth/common/ShibResource.java
index 2dc7d89..b615c2c 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/common/ShibResource.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ShibResource.java
@@ -39,11 +39,20 @@ public class ShibResource {
        public ShibResource(String name, Class requester) throws ResourceNotAvailableException {
 
                try {
-                       resource = new URL(new URL("file:"), name);
+                       resource = new URL(name);
                } catch (MalformedURLException e) {
                        resource = requester.getResource(name);
                }
                if (resource == null) {
+                       // Try as a local file.
+                       File f = new File(name);
+                       if (f.canRead()) {
+                               try {
+                                       resource = f.toURL();
+                               }
+                               catch (MalformedURLException e) {
+                               }
+                       }
                        throw new ResourceNotAvailableException(
                                "ShibResource could not be found at the specified location: " + name);
                }