ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1335397 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security: WSSConfig.java WSSecurityException.java action/SAMLTokenSignedAction.java handler/WSHandler.java message/WSSecEncryptedKey.java util/DOM2Writer.java
Date Tue, 08 May 2012 09:40:32 GMT
Author: coheigea
Date: Tue May  8 09:40:31 2012
New Revision: 1335397

URL: http://svn.apache.org/viewvc?rev=1335397&view=rev
Log:
More minor cleanup

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityException.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/DOM2Writer.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSConfig.java Tue May  8
09:40:31 2012
@@ -94,9 +94,9 @@ public class WSSConfig {
                 Integer.valueOf(WSConstants.SC),
                 org.apache.ws.security.action.SignatureConfirmationAction.class
             );
-        } catch (final Throwable t) {
+        } catch (final Exception ex) {
             if (log.isDebugEnabled()) {
-                log.debug(t.getMessage(), t);
+                log.debug(ex.getMessage(), ex);
             }
         }
         DEFAULT_ACTIONS = java.util.Collections.unmodifiableMap(tmp);
@@ -165,9 +165,9 @@ public class WSSConfig {
                 WSSecurityEngine.ENCRYPTED_DATA,
                 org.apache.ws.security.processor.EncryptedDataProcessor.class
             );
-        } catch (final Throwable t) {
+        } catch (final Exception ex) {
             if (log.isDebugEnabled()) {
-                log.debug(t.getMessage(), t);
+                log.debug(ex.getMessage(), ex);
             }
         }
         DEFAULT_PROCESSORS = java.util.Collections.unmodifiableMap(tmp);
@@ -200,9 +200,9 @@ public class WSSConfig {
                 WSSecurityEngine.USERNAME_TOKEN,
                 org.apache.ws.security.validate.UsernameTokenValidator.class
             );
-        } catch (final Throwable t) {
+        } catch (final Exception ex) {
             if (log.isDebugEnabled()) {
-                log.debug(t.getMessage(), t);
+                log.debug(ex.getMessage(), ex);
             }
         }
         DEFAULT_VALIDATORS = java.util.Collections.unmodifiableMap(tmp);

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityException.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityException.java
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/WSSecurityException.java
Tue May  8 09:40:31 2012
@@ -206,7 +206,7 @@ public class WSSecurityException extends
         try {
             msg = resources.getString(String.valueOf(errorCode));
             if (msgId != null) {
-                return msg += (" (" + MessageFormat.format(resources.getString(msgId), args)
+ ")");
+                return msg += " (" + MessageFormat.format(resources.getString(msgId), args)
+ ")";
             }
         } catch (MissingResourceException e) {
             throw new RuntimeException("Undefined '" + msgId + "' resource property", e);

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
Tue May  8 09:40:31 2012
@@ -50,9 +50,9 @@ public class SAMLTokenSignedAction imple
         */
         try {
             crypto = handler.loadSignatureCrypto(reqData);
-        } catch (Throwable t) {
+        } catch (Exception ex) {
             if (log.isDebugEnabled()) {
-                log.debug(t.getMessage(), t);
+                log.debug(ex.getMessage(), ex);
             }
         }
 

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/handler/WSHandler.java Tue
May  8 09:40:31 2012
@@ -1166,7 +1166,7 @@ public abstract class WSHandler {
     public ClassLoader getClassLoader(Object msgCtx) {
         try {
             return Loader.getTCL();
-        } catch (Throwable t) {
+        } catch (Exception ex) {
             return null;
         }
     }

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
Tue May  8 09:40:31 2012
@@ -303,9 +303,6 @@ public class WSSecEncryptedKey extends W
             break;
 
         case WSConstants.THUMBPRINT_IDENTIFIER:
-            secToken.setKeyIdentifierThumb(remoteCert);
-            break;
-            
         case WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER:
             //
             // This identifier is not applicable for this case, so fall back to

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/DOM2Writer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/DOM2Writer.java?rev=1335397&r1=1335396&r2=1335397&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/DOM2Writer.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/util/DOM2Writer.java Tue
May  8 09:40:31 2012
@@ -41,7 +41,7 @@ import java.io.Writer;
 public class DOM2Writer {
     public static final char NL = '\n';
     public static final String LS = System.getProperty("line.separator",
-            (new Character(NL)).toString());
+            (Character.valueOf(NL)).toString());
 
     /**
      * Return a string containing this node serialized as XML.



Mime
View raw message