[jboss-cvs] Picketbox SVN: r212 - in trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security: auth/spi and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-05-09 15:12:10 -0400 (Mon, 09 May 2011)
New Revision: 212

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java
Log:


Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2011-05-09 18:34:11 UTC (rev 211)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2011-05-09 19:12:10 UTC (rev 212)
@@ -402,7 +402,7 @@
       if (url == null)
       {
          File tst = new File(storeURL);
-         if (tst.exists() == true)
+         if (tst.exists())
             url = tst.toURI().toURL();
       }
 

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java	2011-05-09 18:34:11 UTC (rev 211)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java	2011-05-09 19:12:10 UTC (rev 212)
@@ -21,6 +21,7 @@
 */
 package org.jboss.security.auth.spi;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -198,7 +199,10 @@
                defaultUrl = new URL(defaultsName);
             } catch (MalformedURLException mue) {
                if (trace)
-                  log.trace("Failed to open defaultUrl", mue);
+                  log.trace("Failed to open default properties as URL", mue);
+               File tmp = new File(defaultsName);
+               if (tmp.exists())
+                  defaultUrl = tmp.toURI().toURL();
             }
          }
       }
@@ -209,7 +213,10 @@
                url = new URL(propertiesName);
             } catch (MalformedURLException mue) {
                if (trace)
-                  log.trace("Failed to open url", mue);
+                  log.trace("Failed to open properties as URL", mue);
+               File tmp = new File(propertiesName);
+               if (tmp.exists())
+                  url = tmp.toURI().toURL();
             }
          }
       }