ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1497444 - /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
Date Thu, 27 Jun 2013 17:01:59 GMT
Author: coheigea
Date: Thu Jun 27 17:01:58 2013
New Revision: 1497444

URL: http://svn.apache.org/r1497444
Log:
Fixing error introduced by the last commit

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1497444&r1=1497443&r2=1497444&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
Thu Jun 27 17:01:58 2013
@@ -78,9 +78,7 @@ public class BinarySecurityTokenOutputPr
                         if (securityToken != null) {
                             key = securityToken.getSecretKey(getSecurityProperties().getSignatureAlgorithm());
                             reference = securityToken.getSha1Identifier();
-                            if (securityToken.getTokenType() != null) {
-                                tokenType = securityToken.getTokenType();
-                            }
+                            tokenType = securityToken.getTokenType();
                         }
                     }
                 }
@@ -107,7 +105,8 @@ public class BinarySecurityTokenOutputPr
                         x509Certificates = null;
                         String algoFamily = JCEAlgorithmMapper.getJCEKeyAlgorithmFromURI(getSecurityProperties().getSignatureAlgorithm());
                         key = new SecretKeySpec(secretKey, algoFamily);
-                    } 
+                    }
+                    tokenType = null;
                 } else {
                     bstId = tokenId;
                     x509Certificates = null;



Mime
View raw message