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 2017/03/07 09:51:44 UTC
svn commit: r1785818 - in
/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common:
bsp/ crypto/ saml/ util/
Author: coheigea
Date: Tue Mar 7 09:51:40 2017
New Revision: 1785818
URL: http://svn.apache.org/viewvc?rev=1785818&view=rev
Log:
More log work
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPEnforcer.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPEnforcer.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPEnforcer.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPEnforcer.java Tue Mar 7 09:51:40 2017
@@ -56,8 +56,8 @@ public class BSPEnforcer {
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY, "empty",
new Object[] {"BSP:" + bspRule.name() + ": " + bspRule.getMsg()}
);
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("BSP:" + bspRule.name() + ": " + bspRule.getMsg());
+ } else {
+ LOG.debug("BSP:{}: {}", bspRule.name(), bspRule.getMsg());
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java Tue Mar 7 09:51:40 2017
@@ -363,9 +363,7 @@ public abstract class CryptoBase impleme
for (Pattern subjectDNPattern : patterns) {
final Matcher matcher = subjectDNPattern.matcher(name);
if (matcher.matches()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Name " + name + " matches with pattern " + subjectDNPattern);
- }
+ LOG.debug("Name {} matches with pattern {}", name, subjectDNPattern);
subjectMatch = true;
break;
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java Tue Mar 7 09:51:40 2017
@@ -116,7 +116,6 @@ public class Merlin extends CryptoBase {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Merlin.class);
- private static final boolean DO_DEBUG = LOG.isDebugEnabled();
private static final String COMMA_SEPARATOR = ",";
protected Properties properties;
@@ -218,21 +217,16 @@ public class Merlin extends CryptoBase {
type = type.trim();
}
keystore = load(is, passwd, keystoreProvider, type);
- if (DO_DEBUG) {
- LOG.debug(
- "The KeyStore " + keyStoreLocation + " of type " + type
- + " has been loaded"
- );
- }
+ LOG.debug(
+ "The KeyStore {} of type {} has been loaded", keyStoreLocation, type
+ );
String privatePasswd = properties.getProperty(prefix + KEYSTORE_PRIVATE_PASSWORD);
if (privatePasswd != null) {
privatePasswordSet = true;
}
}
} else {
- if (DO_DEBUG) {
- LOG.debug("The KeyStore is not loaded as KEYSTORE_FILE is null");
- }
+ LOG.debug("The KeyStore is not loaded as KEYSTORE_FILE is null");
}
//
@@ -268,12 +262,9 @@ public class Merlin extends CryptoBase {
type = type.trim();
}
truststore = load(is, passwd, trustProvider, type);
- if (DO_DEBUG) {
- LOG.debug(
- "The TrustStore " + trustStoreLocation + " of type " + type
- + " has been loaded"
- );
- }
+ LOG.debug(
+ "The TrustStore {} of type {} has been loaded", trustStoreLocation, type
+ );
loadCACerts = false;
}
} else {
@@ -293,9 +284,7 @@ public class Merlin extends CryptoBase {
cacertsPasswd = decryptPassword(cacertsPasswd, passwordEncryptor);
}
truststore = load(is, cacertsPasswd, null, KeyStore.getDefaultType());
- if (DO_DEBUG) {
- LOG.debug("CA certs have been loaded");
- }
+ LOG.debug("CA certs have been loaded");
loadCACerts = true;
}
}
@@ -314,9 +303,7 @@ public class Merlin extends CryptoBase {
X509CRL crl = (X509CRL)cf.generateCRL(is);
crls.add(crl);
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "ioError00");
}
}
@@ -337,17 +324,10 @@ public class Merlin extends CryptoBase {
);
}
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "ioError00");
}
- if (DO_DEBUG) {
- LOG.debug(
- "The CRL files " + crlLocations + " have been loaded"
- );
- }
-
+ LOG.debug("The CRL files {} have been loaded", crlLocations);
}
}
@@ -380,9 +360,7 @@ public class Merlin extends CryptoBase {
try {
is = new FileInputStream(location);
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, e, "proxyNotFound", new Object[] {location}
);
@@ -414,9 +392,7 @@ public class Merlin extends CryptoBase {
ks.load(input, storepass == null || storepass.length() == 0
? new char[0] : storepass.toCharArray());
} catch (IOException | GeneralSecurityException e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "failedCredentialLoad");
}
return ks;
@@ -807,11 +783,9 @@ public class Merlin extends CryptoBase {
WSSecurityException.ErrorCode.FAILED_CHECK, e, "invalidCert"
);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Direct trust for certificate with " + certs[0].getSubjectX500Principal().getName()
- );
- }
+ LOG.debug(
+ "Direct trust for certificate with {}", certs[0].getSubjectX500Principal().getName()
+ );
return;
}
}
@@ -838,12 +812,10 @@ public class Merlin extends CryptoBase {
if (foundIssuingCertChains == null || foundIssuingCertChains.isEmpty()
|| foundIssuingCertChains.get(0).length < 1) {
String subjectString = certs[0].getSubjectX500Principal().getName();
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "No certs found in keystore for issuer " + issuerString
- + " of certificate for " + subjectString
- );
- }
+ LOG.debug(
+ "No certs found in keystore for issuer {} of certificate for {}",
+ issuerString, subjectString
+ );
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath", new Object[] {"No trusted certs found"}
);
@@ -854,11 +826,9 @@ public class Merlin extends CryptoBase {
// THIRD step
// Check the certificate trust path for the issuer cert chain
//
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Preparing to validate certificate path for issuer " + issuerString
- );
- }
+ LOG.debug(
+ "Preparing to validate certificate path for issuer {}", issuerString
+ );
try {
Set<TrustAnchor> set = new HashSet<>();
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinAKI.java Tue Mar 7 09:51:40 2017
@@ -109,11 +109,9 @@ public class MerlinAKI extends Merlin {
WSSecurityException.ErrorCode.FAILED_CHECK, e, "invalidCert"
);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Direct trust for certificate with " + certs[0].getSubjectX500Principal().getName()
- );
- }
+ LOG.debug(
+ "Direct trust for certificate with {}", certs[0].getSubjectX500Principal().getName()
+ );
return;
}
}
@@ -134,12 +132,10 @@ public class MerlinAKI extends Merlin {
// As a direct result, do not trust the transmitted certificate
if (foundCerts == null || foundCerts.length < 1) {
String subjectString = certs[0].getSubjectX500Principal().getName();
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "No certs found in keystore for issuer " + issuerString
- + " of certificate for " + subjectString
- );
- }
+ LOG.debug(
+ "No certs found in keystore for issuer {} of certificate for {}",
+ issuerString, subjectString
+ );
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "certpath", new Object[] {"No trusted certs found"}
);
@@ -161,11 +157,9 @@ public class MerlinAKI extends Merlin {
// THIRD step
// Check the certificate trust path for the issuer cert chain
//
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "Preparing to validate certificate path for issuer " + issuerString
- );
- }
+ LOG.debug(
+ "Preparing to validate certificate path for issuer {}", issuerString
+ );
try {
// Generate cert path
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java Tue Mar 7 09:51:40 2017
@@ -41,7 +41,6 @@ public class MerlinDevice extends Merlin
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(MerlinDevice.class);
- private static final boolean DO_DEBUG = LOG.isDebugEnabled();
public MerlinDevice() {
super();
@@ -111,12 +110,9 @@ public class MerlinDevice extends Merlin
try (InputStream is = loadInputStream(loader, keyStoreLocation)) {
keystore = load(is, keyStorePassword, provider, keyStoreType);
- if (DO_DEBUG) {
- LOG.debug(
- "The KeyStore " + keyStoreLocation + " of type " + keyStoreType
- + " has been loaded"
- );
- }
+ LOG.debug(
+ "The KeyStore {} of type {} has been loaded", keyStoreLocation, keyStoreType
+ );
}
} else {
keystore = load(null, keyStorePassword, provider, keyStoreType);
@@ -144,12 +140,9 @@ public class MerlinDevice extends Merlin
try (InputStream is = loadInputStream(loader, trustStoreLocation)) {
truststore = load(is, trustStorePassword, provider, trustStoreType);
- if (DO_DEBUG) {
- LOG.debug(
- "The TrustStore " + trustStoreLocation + " of type " + trustStoreType
- + " has been loaded"
- );
- }
+ LOG.debug(
+ "The TrustStore {} of type {} has been loaded", trustStoreLocation, trustStoreType
+ );
loadCACerts = false;
}
} else if (Boolean.valueOf(loadCacerts)) {
@@ -164,9 +157,7 @@ public class MerlinDevice extends Merlin
cacertsPasswd = decryptPassword(cacertsPasswd, passwordEncryptor);
}
truststore = load(is, cacertsPasswd, null, KeyStore.getDefaultType());
- if (DO_DEBUG) {
- LOG.debug("CA certs have been loaded");
- }
+ LOG.debug("CA certs have been loaded");
loadCACerts = true;
}
} else {
@@ -197,15 +188,9 @@ public class MerlinDevice extends Merlin
provider
);
}
- if (DO_DEBUG) {
- LOG.debug(
- "The CRL " + crlLocation + " has been loaded"
- );
- }
+ LOG.debug("The CRL {} has been loaded", crlLocation);
} catch (Exception e) {
- if (DO_DEBUG) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "failedCredentialLoad");
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java Tue Mar 7 09:51:40 2017
@@ -297,12 +297,10 @@ public final class WSProviderConfig {
Provider provider = clazz.newInstance();
int ret = Security.addProvider(provider);
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "The provider " + provider.getName()
- + " was added at position: " + ret
- );
- }
+ LOG.debug(
+ "The provider {} was added at position: {}",
+ provider.getName(), ret
+ );
return provider.getName();
} catch (Throwable t) {
if (LOG.isDebugEnabled()) {
@@ -332,12 +330,10 @@ public final class WSProviderConfig {
if (currentProvider == null) {
try {
int ret = Security.addProvider(provider);
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "The provider " + provider.getName()
- + " was added at position: " + ret
- );
- }
+ LOG.debug(
+ "The provider {} was added at position: {}",
+ provider.getName(), ret
+ );
return provider.getName();
} catch (Throwable t) {
if (LOG.isDebugEnabled()) {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Tue Mar 7 09:51:40 2017
@@ -497,9 +497,8 @@ public class SamlAssertionWrapper {
c14nAlgo = defaultCanonicalizationAlgorithm;
}
signature.setCanonicalizationAlgorithm(c14nAlgo);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using Canonicalization algorithm " + c14nAlgo);
- }
+ LOG.debug("Using Canonicalization algorithm {}", c14nAlgo);
+
// prepare to sign the SAML token
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias(issuerKeyName);
@@ -518,15 +517,11 @@ public class SamlAssertionWrapper {
sigAlgo = defaultRSASignatureAlgorithm;
}
String pubKeyAlgo = issuerCerts[0].getPublicKey().getAlgorithm();
- if (LOG.isDebugEnabled()) {
- LOG.debug("automatic sig algo detection: " + pubKeyAlgo);
- }
+ LOG.debug("automatic sig algo detection: {}", pubKeyAlgo);
if (pubKeyAlgo.equalsIgnoreCase("DSA")) {
sigAlgo = defaultDSASignatureAlgorithm;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using Signature algorithm " + sigAlgo);
- }
+ LOG.debug("Using Signature algorithm {}", sigAlgo);
PrivateKey privateKey;
try {
privateKey = issuerCrypto.getPrivateKey(issuerKeyName, issuerKeyPassword);
@@ -683,11 +678,8 @@ public class SamlAssertionWrapper {
public SAMLVersion getSamlVersion() {
if (samlVersion == null) {
// Try to set the version.
- if (LOG.isDebugEnabled()) {
- LOG.debug(
- "The SAML version was null in getSamlVersion(). Recomputing SAML version..."
- );
- }
+ LOG.debug(
+ "The SAML version was null in getSamlVersion(). Recomputing SAML version...");
if (samlObject instanceof org.opensaml.saml.saml1.core.Assertion) {
samlVersion = SAMLVersion.VERSION_11;
} else if (samlObject instanceof org.opensaml.saml.saml2.core.Assertion) {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DateUtil.java Tue Mar 7 09:51:40 2017
@@ -53,9 +53,7 @@ public final class DateUtil {
}
// Check to see if the created time is in the future
if (createdDate.after(validCreation)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Validation of Created: The message was created in the future!");
- }
+ LOG.debug("Validation of Created: The message was created in the future!");
return false;
}
@@ -65,15 +63,11 @@ public final class DateUtil {
// Validate the time it took the message to travel
if (createdDate.before(validCreation)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Validation of Created: The message was created too long ago");
- }
+ LOG.debug("Validation of Created: The message was created too long ago");
return false;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Validation of Created: Everything is ok");
- }
+ LOG.debug("Validation of Created: Everything is ok");
return true;
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/KeyUtils.java Tue Mar 7 09:51:40 2017
@@ -68,9 +68,7 @@ public final class KeyUtils {
size = getKeyLength(algorithm);
} catch (Exception e) {
// ignore - some unknown (to JCEMapper) encryption algorithm
- if (LOG.isDebugEnabled()) {
- LOG.debug(e.getMessage());
- }
+ LOG.debug(e.getMessage());
}
String keyAlgorithm = JCEMapper.getJCEKeyAlgorithmFromURI(algorithm);
SecretKeySpec keySpec;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/Loader.java Tue Mar 7 09:51:40 2017
@@ -92,9 +92,7 @@ public final class Loader {
// may be the case that clazz was loaded by the Extension class
// loader which the parent of the system class loader. Hence the
// code below.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Trying to find [" + resource + "] using ClassLoader.getSystemResource().");
- }
+ LOG.debug("Trying to find [{}] using ClassLoader.getSystemResource().", resource);
return ClassLoader.getSystemResource(resource);
}
@@ -150,9 +148,7 @@ public final class Loader {
try {
return (url != null) ? url.openStream() : null;
} catch (IOException e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
return null;
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java?rev=1785818&r1=1785817&r2=1785818&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/UsernameTokenUtil.java Tue Mar 7 09:51:40 2017
@@ -60,9 +60,7 @@ public final class UsernameTokenUtil {
try {
sha = MessageDigest.getInstance("SHA1");
} catch (NoSuchAlgorithmException e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(e.getMessage(), e);
- }
+ LOG.debug(e.getMessage(), e);
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, e, "decoding.general"
);