You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/04/15 16:14:18 UTC

svn commit: r1468087 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java

Author: coheigea
Date: Mon Apr 15 14:14:17 2013
New Revision: 1468087

URL: http://svn.apache.org/r1468087
Log:
Remove some unnecessary logging warnings

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java?rev=1468087&r1=1468086&r2=1468087&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/handler/WSHandler.java Mon Apr 15 14:14:17 2013
@@ -911,20 +911,13 @@ public abstract class WSHandler {
                     crypto = loadCryptoFromPropertiesFile(propFile, requestData);
                     cryptos.put(propFile, crypto);
                 }
-            } 
-            if (crypto == null) {
-                if (propFile == null) {
-                    log.warn(
-                         "The Crypto properties file specified by "
-                         + cryptoPropertyFile + " is null"
-                    );
-                } else {
+                if (crypto == null) {
                     log.warn(
                          "The Crypto properties file " + propFile + " specified by "
                          + cryptoPropertyFile + " could not be loaded or found"
                     );
                 }
-            }
+            } 
         }
 
         return crypto;