svn commit: r1509702 - /cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java

[sergeyb]

Author: sergeyb
Date: Fri Aug  2 13:38:11 2013
New Revision: 1509702

URL: http://svn.apache.org/r1509702
Log:
Moving a try block a bit higher

Modified:
    
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java

Modified: 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java?rev=1509702&r1=1509701&r2=1509702&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
 (original)
+++ 
cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/CryptoLoader.java
 Fri Aug  2 13:38:11 2013
@@ -87,19 +87,19 @@ public class CryptoLoader {
                 url = manager.resolveResource(propResourceName, URL.class);
             }
             if (url == null) {
-                URI propResourceUri = URI.create(propResourceName);
-                if (propResourceUri.getScheme() != null) {
-                    url = propResourceUri.toURL();
-                } else {
-                    try {
+                try {
+                    URI propResourceUri = URI.create(propResourceName);
+                    if (propResourceUri.getScheme() != null) {
+                        url = propResourceUri.toURL();
+                    } else {
                         File f = new File(propResourceUri.toString());
                         if (f.exists()) { 
                             url = f.toURI().toURL();
                         }
-                    } catch (IOException ex) {
-                        // let CryptoFactory try to load it
                     }
-                }
+                } catch (IOException ex) {
+                    // let CryptoFactory try to load it
+                }   
             }
             if (url != null) {
                 crypto = loadCryptoFromURL(url);