Author: thilinamb Date: Sat Feb 19 13:04:52 2011 New Revision: 1072321 URL: http://svn.apache.org/viewvc?rev=1072321&view=rev Log: Removing unnecessary isDebugEnabled checks and using isDebugEnabled() instead of the static variable.
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java Sat Feb 19 13:04:52 2011 @@ -52,8 +52,7 @@ import javax.xml.namespace.QName; public class MessageBuilder { private static Log log = LogFactory.getLog(MessageBuilder.class); - private static boolean doDebug = log.isDebugEnabled(); - + public void build(MessageContext msgCtx) throws WSSPolicyException, RampartException, WSSecurityException, AxisFault { @@ -136,15 +135,11 @@ public class MessageBuilder { } if(rpd.isTransportBinding()) { - if (doDebug) { - log.debug("Building transport binding"); - } + log.debug("Building transport binding"); TransportBindingBuilder building = new TransportBindingBuilder(); building.build(rmd); } else if(rpd.isSymmetricBinding()) { - if (doDebug) { - log.debug("Building SymmetricBinding"); - } + log.debug("Building SymmetricBinding"); SymmetricBindingBuilder builder = new SymmetricBindingBuilder(); builder.build(rmd); } else { Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java Sat Feb 19 13:04:52 2011 @@ -17,9 +17,15 @@ package org.apache.rampart; import org.apache.axiom.om.OMElement; -import org.apache.axiom.soap.*; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAP12Constants; +import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.axiom.soap.SOAPFault; +import org.apache.axiom.soap.SOAPFaultCode; +import org.apache.axiom.soap.SOAPFaultSubCode; +import org.apache.axiom.soap.SOAPFaultValue; +import org.apache.axiom.soap.SOAPHeader; +import org.apache.axiom.soap.SOAPHeaderBlock; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.commons.logging.Log; @@ -32,18 +38,21 @@ import org.apache.rampart.policy.Rampart import org.apache.rampart.util.Axis2Util; import org.apache.rampart.util.RampartUtil; import org.apache.ws.secpolicy.WSSPolicyException; -import org.apache.ws.security.*; +import org.apache.ws.security.WSConstants; +import org.apache.ws.security.WSSecurityEngine; +import org.apache.ws.security.WSSecurityEngineResult; +import org.apache.ws.security.WSSecurityException; +import org.apache.ws.security.WSUsernameTokenPrincipal; import org.apache.ws.security.components.crypto.Crypto; import org.apache.ws.security.saml.SAMLKeyInfo; import org.apache.ws.security.saml.SAMLUtil; import org.opensaml.SAMLAssertion; import org.opensaml.saml2.core.Assertion; +import org.opensaml.saml2.core.Conditions; import org.opensaml.saml2.core.Subject; import org.opensaml.saml2.core.SubjectConfirmationData; -import org.opensaml.saml2.core.Conditions; import javax.xml.namespace.QName; -import java.security.Principal; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Date; @@ -62,9 +71,7 @@ public class RampartEngine { boolean doDebug = log.isDebugEnabled(); boolean dotDebug = tlog.isDebugEnabled(); - if(doDebug){ - log.debug("Enter process(MessageContext msgCtx)"); - } + log.debug("Enter process(MessageContext msgCtx)"); RampartMessageData rmd = new RampartMessageData(msgCtx, false); @@ -89,10 +96,8 @@ public class RampartEngine { //Convert back to llom since the inflow cannot use llom msgCtx.setEnvelope(env); Axis2Util.useDOOM(false); - if(doDebug){ - log.debug("Return process MessageContext msgCtx)"); - } - return null; + log.debug("Return process MessageContext msgCtx)"); + return null; } @@ -139,10 +144,8 @@ public class RampartEngine { if(rpd.isSymmetricBinding()) { //Here we have to create the CB handler to get the tokens from the //token storage - if(doDebug){ - log.debug("Processing security header using SymetricBinding"); - } - results = engine.processSecurityHeader(rmd.getDocument(), + log.debug("Processing security header using SymetricBinding"); + results = engine.processSecurityHeader(rmd.getDocument(), actorValue, tokenCallbackHandler, signatureCrypto, @@ -157,9 +160,7 @@ public class RampartEngine { } } else { - if(doDebug){ - log.debug("Processing security header in normal path"); - } + log.debug("Processing security header in normal path"); results = engine.processSecurityHeader(rmd.getDocument(), actorValue, tokenCallbackHandler, @@ -322,9 +323,7 @@ public class RampartEngine { ", PolicyBasedResultsValidattor took " + (t3 - t2)); } - if(doDebug){ - log.debug("Return process(MessageContext msgCtx)"); - } + log.debug("Return process(MessageContext msgCtx)"); return results; } Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Sat Feb 19 13:04:52 2011 @@ -53,9 +53,7 @@ public class AsymmetricBindingBuilder ex private static Log log = LogFactory.getLog(AsymmetricBindingBuilder.class); private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG); - private static boolean doDebug = log.isDebugEnabled(); - private static boolean dotDebug = tlog.isDebugEnabled(); - + private Token sigToken; private WSSecSignature sig; @@ -79,9 +77,7 @@ public class AsymmetricBindingBuilder ex private Element signatureElement; public void build(RampartMessageData rmd) throws RampartException { - if (doDebug) { - log.debug("AsymmetricBindingBuilder build invoked"); - } + log.debug("AsymmetricBindingBuilder build invoked"); RampartPolicyData rpd = rmd.getPolicyData(); if (rpd.isIncludeTimestamp()) { @@ -94,16 +90,14 @@ public class AsymmetricBindingBuilder ex this.doSignBeforeEncrypt(rmd); } - if (doDebug) { - log.debug("AsymmetricBindingBuilder build invoked : DONE"); - } + log.debug("AsymmetricBindingBuilder build invoked : DONE"); } private void doEncryptBeforeSig(RampartMessageData rmd) throws RampartException { long t0 = 0, t1 = 0, t2 = 0; - if(dotDebug){ + if(tlog.isDebugEnabled()){ t0 = System.currentTimeMillis(); } RampartPolicyData rpd = rmd.getPolicyData(); @@ -198,7 +192,7 @@ public class AsymmetricBindingBuilder ex RampartUtil.appendChildToSecHeader(rmd, refList); - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); } @@ -282,7 +276,7 @@ public class AsymmetricBindingBuilder ex } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t2 = System.currentTimeMillis(); tlog.debug("Encryption took :" + (t1 - t0) +", Signature tool :" + (t2 - t1) ); @@ -291,7 +285,7 @@ public class AsymmetricBindingBuilder ex // Check for signature protection if (rpd.isSignatureProtection() && this.mainSigId != null) { long t3 = 0, t4 = 0; - if(dotDebug){ + if(tlog.isDebugEnabled()){ t3 = System.currentTimeMillis(); } Vector secondEncrParts = new Vector(); @@ -334,7 +328,7 @@ public class AsymmetricBindingBuilder ex throw new RampartException("errorInEncryption", e); } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t4 = System.currentTimeMillis(); tlog.debug("Signature protection took :" + (t4 - t3)); } @@ -370,7 +364,7 @@ public class AsymmetricBindingBuilder ex this.setInsertionLocation(null); } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t0 = System.currentTimeMillis(); } @@ -460,7 +454,7 @@ public class AsymmetricBindingBuilder ex } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); } @@ -592,7 +586,7 @@ public class AsymmetricBindingBuilder ex } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t2 = System.currentTimeMillis(); tlog.debug("Signature took :" + (t1 - t0) +", Encryption took :" + (t2 - t1) ); @@ -608,7 +602,7 @@ public class AsymmetricBindingBuilder ex Element supportingSignatureElement; long t0 = 0, t1 = 0; - if (dotDebug) { + if (tlog.isDebugEnabled()) { t0 = System.currentTimeMillis(); } @@ -644,7 +638,7 @@ public class AsymmetricBindingBuilder ex signatureValues.add(supportingSig.getSignatureValue()); - if (dotDebug) { + if (tlog.isDebugEnabled()) { t1 = System.currentTimeMillis(); tlog.debug("Signature took :" + (t1 - t0)); } @@ -657,7 +651,7 @@ public class AsymmetricBindingBuilder ex Document doc = rmd.getDocument(); long t0 = 0, t1 = 0; - if(dotDebug){ + if(tlog.isDebugEnabled()){ t0 = System.currentTimeMillis(); } if(rmd.isInitiator()) { @@ -749,7 +743,7 @@ public class AsymmetricBindingBuilder ex signatureValues.add(sig.getSignatureValue()); } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); tlog.debug("Signature took :" + (t1 - t0)); } Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java Sat Feb 19 13:04:52 2011 @@ -70,7 +70,6 @@ import java.util.Map.Entry; public abstract class BindingBuilder { private static Log log = LogFactory.getLog(BindingBuilder.class); - private static boolean doDebug = log.isDebugEnabled(); private Element insertionLocation; @@ -87,9 +86,7 @@ public abstract class BindingBuilder { * @param rmd */ protected void addTimestamp(RampartMessageData rmd) { - if (doDebug) { - log.debug("Adding timestamp"); - } + log.debug("Adding timestamp"); WSSecTimestamp timestampBuilder = new WSSecTimestamp(); timestampBuilder.setWsConfig(rmd.getConfig()); @@ -101,16 +98,13 @@ public abstract class BindingBuilder { timestampBuilder.build(rmd.getDocument(), rmd .getSecHeader()); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Timestamp id: " + timestampBuilder.getId()); } - rmd.setTimestampId(timestampBuilder.getId()); this.timestampElement = timestampBuilder.getElement(); - if (doDebug) { - log.debug("Adding timestamp: DONE"); - } + log.debug("Adding timestamp: DONE"); } /** @@ -121,9 +115,7 @@ public abstract class BindingBuilder { */ protected WSSecUsernameToken addUsernameToken(RampartMessageData rmd, UsernameToken token) throws RampartException { - if (doDebug) { - log.debug("Adding a UsernameToken"); - } + log.debug("Adding a UsernameToken"); RampartPolicyData rpd = rmd.getPolicyData(); @@ -139,7 +131,7 @@ public abstract class BindingBuilder { } if(user != null && !"".equals(user)) { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("User : " + user); } @@ -182,7 +174,7 @@ public abstract class BindingBuilder { password = cb[0].getPassword(); } - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Password : " + password); } @@ -209,9 +201,7 @@ public abstract class BindingBuilder { } } else { - if (doDebug) { - log.debug("No user value specified in the configuration"); - } + log.debug("No user value specified in the configuration"); throw new RampartException("userMissing"); } @@ -274,7 +264,7 @@ public abstract class BindingBuilder { checkForX509PkiPath(sig, token); sig.setWsConfig(rmd.getConfig()); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Token inclusion: " + token.getInclusion()); } @@ -300,7 +290,7 @@ public abstract class BindingBuilder { String password = null; if(user != null && !"".equals(user)) { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("User : " + user); } @@ -319,7 +309,7 @@ public abstract class BindingBuilder { handler.handle(cb); if(cb[0].getPassword() != null && !"".equals(cb[0].getPassword())) { password = cb[0].getPassword(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Password : " + password); } } else { @@ -336,9 +326,7 @@ public abstract class BindingBuilder { } } else { - if (doDebug) { - log.debug("No user value specified in the configuration"); - } + log.debug("No user value specified in the configuration"); throw new RampartException("userMissing"); } @@ -370,9 +358,7 @@ public abstract class BindingBuilder { if(suppTokens != null && suppTokens.getTokens() != null && suppTokens.getTokens().size() > 0) { - if (doDebug) { - log.debug("Processing supporting tokens"); - } + log.debug("Processing supporting tokens"); ArrayList tokens = suppTokens.getTokens(); for (Iterator iter = tokens.iterator(); iter.hasNext();) { @@ -807,7 +793,7 @@ public abstract class BindingBuilder { // prepare a SignatureConfirmation token WSSecSignatureConfirmation wsc = new WSSecSignatureConfirmation(); if (signatureActions.size() > 0) { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Signature Confirmation: number of Signature results: " + signatureActions.size()); } Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java Sat Feb 19 13:04:52 2011 @@ -63,14 +63,10 @@ public class SymmetricBindingBuilder ext private static Log log = LogFactory.getLog(SymmetricBindingBuilder.class); private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG); - private static boolean dotDebug = tlog.isDebugEnabled(); - private static boolean doDebug = log.isDebugEnabled(); public void build(RampartMessageData rmd) throws RampartException { - if (doDebug) { - log.debug("SymmetricBindingBuilder build invoked"); - } + log.debug("SymmetricBindingBuilder build invoked"); RampartPolicyData rpd = rmd.getPolicyData(); if(rpd.isIncludeTimestamp()) { @@ -89,10 +85,7 @@ public class SymmetricBindingBuilder ext this.doSignBeforeEncrypt(rmd); } - - if (doDebug) { - log.debug("SymmetricBindingBuilder build invoked : DONE"); - } + log.debug("SymmetricBindingBuilder build invoked : DONE"); } @@ -104,7 +97,7 @@ public class SymmetricBindingBuilder ext Vector signatureValues = new Vector(); - if(dotDebug){ + if(tlog.isDebugEnabled()){ t0 = System.currentTimeMillis(); } @@ -125,12 +118,12 @@ public class SymmetricBindingBuilder ext if(encryptionToken instanceof IssuedToken) { tokenId = rmd.getIssuedEncryptionTokenId(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Issued EncryptionToken Id : " + tokenId); } } else if(encryptionToken instanceof SecureConversationToken) { tokenId = rmd.getSecConvTokenId(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("SCT Id : " + tokenId); } } else if (encryptionToken instanceof X509Token) { @@ -180,9 +173,7 @@ public class SymmetricBindingBuilder ext AlgorithmSuite algorithmSuite = rpd.getAlgorithmSuite(); if(encryptionToken.isDerivedKeys()) { - if (doDebug) { - log.debug("Use drived keys"); - } + log.debug("Use drived keys"); dkEncr = new WSSecDKEncrypt(); @@ -214,9 +205,7 @@ public class SymmetricBindingBuilder ext throw new RampartException("errorInDKEncr"); } } else { - if (doDebug) { - log.debug("NO derived keys, use the shared secret"); - } + log.debug("NO derived keys, use the shared secret"); encr = new WSSecEncrypt(); encr.setWsConfig(rmd.getConfig()); @@ -246,7 +235,7 @@ public class SymmetricBindingBuilder ext this.mainRefListElement = RampartUtil.appendChildToSecHeader(rmd, refList); - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); } @@ -336,7 +325,7 @@ public class SymmetricBindingBuilder ext } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t2 = System.currentTimeMillis(); tlog.debug("Encryption took :" + (t1 - t0) +", Signature tool :" + (t2 - t1) ); @@ -346,12 +335,10 @@ public class SymmetricBindingBuilder ext if(rpd.isSignatureProtection() && this.mainSigId != null || encryptedTokensIdList.size() > 0 && rmd.isInitiator()) { long t3 = 0, t4 = 0; - if(dotDebug){ + if(tlog.isDebugEnabled()){ t3 = System.currentTimeMillis(); } - if (doDebug) { - log.debug("Signature protection"); - } + log.debug("Signature protection"); Vector secondEncrParts = new Vector(); //Now encrypt the signature using the above token @@ -391,7 +378,7 @@ public class SymmetricBindingBuilder ext throw new RampartException("errorInEncryption", e); } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t4 = System.currentTimeMillis(); tlog.debug("Signature protection took :" + (t4 - t3)); } @@ -410,7 +397,7 @@ public class SymmetricBindingBuilder ext RampartPolicyData rpd = rmd.getPolicyData(); Document doc = rmd.getDocument(); - if(dotDebug){ + if(tlog.isDebugEnabled()){ t0 = System.currentTimeMillis(); } Token sigToken = rpd.getSignatureToken(); @@ -542,7 +529,7 @@ public class SymmetricBindingBuilder ext } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); } @@ -697,7 +684,7 @@ public class SymmetricBindingBuilder ext } } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t2 = System.currentTimeMillis(); tlog.debug("Signature took :" + (t1 - t0) +", Encryption took :" + (t2 - t1) ); @@ -827,7 +814,7 @@ public class SymmetricBindingBuilder ext MessageContext msgContext = rmd.getMsgContext(); if(rpd.isSymmetricBinding() && !msgContext.isServerSide()) { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Processing symmetric binding: " + "Setting up encryption token and signature token"); } @@ -836,15 +823,9 @@ public class SymmetricBindingBuilder ext Token sigTok = rpd.getSignatureToken(); Token encrTok = rpd.getEncryptionToken(); if(sigTok instanceof IssuedToken) { - - if (doDebug) { - log.debug("SignatureToken is an IssuedToken"); - } - + log.debug("SignatureToken is an IssuedToken"); if(rmd.getIssuedSignatureTokenId() == null) { - if (doDebug) { - log.debug("No Issuedtoken found, requesting a new token"); - } + log.debug("No Issuedtoken found, requesting a new token"); IssuedToken issuedToken = (IssuedToken)sigTok; @@ -856,9 +837,7 @@ public class SymmetricBindingBuilder ext } else if(sigTok instanceof SecureConversationToken) { - if (doDebug) { - log.debug("SignatureToken is a SecureConversationToken"); - } + log.debug("SignatureToken is a SecureConversationToken"); //TODO check for an existing token and use it @@ -884,15 +863,12 @@ public class SymmetricBindingBuilder ext throw new RampartException("errorExtractingToken"); } } - + if (secConvTokenId == null - || (secConvTokenId != null && - (!RampartUtil.isTokenValid(rmd, secConvTokenId) && !cancelReqResp))) { + || (secConvTokenId != null && + (!RampartUtil.isTokenValid(rmd, secConvTokenId) && !cancelReqResp))) { - if (doDebug) { - log.debug("No SecureConversationToken found, " + - "requesting a new token"); - } + log.debug("No SecureConversationToken found, requesting a new token"); SecureConversationToken secConvTok = (SecureConversationToken) sigTok; @@ -912,10 +888,8 @@ public class SymmetricBindingBuilder ext //same as encrTok if(sigTok.equals(encrTok) && sigTok instanceof IssuedToken) { - if (doDebug) { - log.debug("Symmetric binding uses a ProtectionToken, both" + + log.debug("Symmetric binding uses a ProtectionToken, both" + " SignatureToken and EncryptionToken are the same"); - } rmd.setIssuedEncryptionTokenId(rmd.getIssuedEncryptionTokenId()); } else { @@ -924,14 +898,11 @@ public class SymmetricBindingBuilder ext //ProtectionToken therefore we only have to process a issued //token here - if (doDebug) { - log.debug("Obtaining the Encryption Token"); - } + log.debug("Obtaining the Encryption Token"); + if(rmd.getIssuedEncryptionTokenId() != null) { - if (doDebug) { - log.debug("EncrytionToken not alredy set"); - } + log.debug("EncrytionToken not alredy set"); IssuedToken issuedToken = (IssuedToken)encrTok; Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java Sat Feb 19 13:04:52 2011 @@ -58,17 +58,13 @@ public class TransportBindingBuilder ext private static Log log = LogFactory.getLog(TransportBindingBuilder.class); private static Log tlog = LogFactory.getLog(RampartConstants.TIME_LOG); - private static boolean dotDebug = tlog.isDebugEnabled(); - private static boolean doDebug = log.isDebugEnabled(); - + public void build(RampartMessageData rmd) throws RampartException { - if (doDebug) { - log.debug("TransportBindingBuilder build invoked"); - } + log.debug("TransportBindingBuilder build invoked"); long t0 = 0, t1 = 0; - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); } @@ -89,9 +85,7 @@ public class TransportBindingBuilder ext if(sgndSuppTokens != null && sgndSuppTokens.getTokens() != null && sgndSuppTokens.getTokens().size() > 0) { - if (doDebug) { - log.debug("Processing signed supporting tokens"); - } + log.debug("Processing signed supporting tokens"); ArrayList tokens = sgndSuppTokens.getTokens(); for (Iterator iter = tokens.iterator(); iter.hasNext();) { @@ -117,9 +111,7 @@ public class TransportBindingBuilder ext if(sgndEndSuppTokens != null && sgndEndSuppTokens.getTokens() != null && sgndEndSuppTokens.getTokens().size() > 0) { - if (doDebug) { - log.debug("Processing endorsing signed supporting tokens"); - } + log.debug("Processing endorsing signed supporting tokens"); ArrayList tokens = sgndEndSuppTokens.getTokens(); SignedEncryptedParts signdParts = sgndEndSuppTokens.getSignedParts(); @@ -136,9 +128,7 @@ public class TransportBindingBuilder ext SupportingToken endSupptokens = rpd.getEndorsingSupportingTokens(); if(endSupptokens != null && endSupptokens.getTokens() != null && endSupptokens.getTokens().size() > 0) { - if (doDebug) { - log.debug("Processing endorsing supporting tokens"); - } + log.debug("Processing endorsing supporting tokens"); ArrayList tokens = endSupptokens.getTokens(); SignedEncryptedParts signdParts = endSupptokens.getSignedParts(); for (Iterator iter = tokens.iterator(); iter.hasNext();) { @@ -167,7 +157,7 @@ public class TransportBindingBuilder ext addSignatureConfirmation(rmd, null); } - if(dotDebug){ + if(tlog.isDebugEnabled()){ t1 = System.currentTimeMillis(); tlog.debug("Transport binding build took "+ (t1 - t0)); } @@ -620,10 +610,7 @@ public class TransportBindingBuilder ext || (secConvTokenId != null && (!RampartUtil.isTokenValid(rmd, secConvTokenId) && !cancelReqResp))) { - if (doDebug) { - log.debug("No SecureConversationToken found, " + - "requesting a new token"); - } + log.debug("No SecureConversationToken found, requesting a new token"); try { Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java Sat Feb 19 13:04:52 2011 @@ -49,7 +49,6 @@ import java.util.List; public class RampartPolicyBuilder { private static Log log = LogFactory.getLog(RampartPolicyBuilder.class); - private static boolean doDebug = log.isDebugEnabled(); /** * Compile the parsed security data into one Policy data block. @@ -111,7 +110,7 @@ public class RampartPolicyBuilder { } else if (assertion instanceof MTOMAssertion){ processMTOMSerialization((MTOMAssertion)assertion, rpd); } else { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Unknown top level PED found: " + assertion.getClass().getName()); } Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sat Feb 19 13:04:52 2011 @@ -97,7 +97,6 @@ public class RampartUtil { private static final String CRYPTO_PROVIDER = "org.apache.ws.security.crypto.provider"; private static Log log = LogFactory.getLog(RampartUtil.class); - private static boolean doDebug = log.isDebugEnabled(); private static Map<String, CachedCrypto> cryptoStore = new ConcurrentHashMap<String, CachedCrypto>(); @@ -134,7 +133,7 @@ public class RampartUtil { String cbHandlerClass = rpd.getRampartConfig().getPwCbClass(); ClassLoader classLoader = msgContext.getAxisService().getClassLoader(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("loading class : " + cbHandlerClass); } @@ -183,7 +182,7 @@ public class RampartUtil { String cbHandlerClass = rpd.getRampartConfig().getPolicyValidatorCbClass(); ClassLoader classLoader = msgContext.getAxisService().getClassLoader(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("loading class : " + cbHandlerClass); } @@ -218,7 +217,7 @@ public class RampartUtil { String cbHandlerClass = rpd.getRampartConfig().getRampartConfigCbClass(); ClassLoader classLoader = msgContext.getAxisService().getClassLoader(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("loading class : " + cbHandlerClass); } @@ -299,16 +298,14 @@ public class RampartUtil { public static Crypto getEncryptionCrypto(RampartConfig config, ClassLoader loader) throws RampartException { - if (doDebug) { - log.debug("Loading encryption crypto"); - } + log.debug("Loading encryption crypto"); Crypto crypto = null; if (config != null && config.getEncrCryptoConfig() != null) { CryptoConfig cryptoConfig = config.getEncrCryptoConfig(); String provider = cryptoConfig.getProvider(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Using provider: " + provider); } Properties prop = cryptoConfig.getProp(); @@ -341,9 +338,7 @@ public class RampartUtil { } } } else { - if (doDebug) { - log.debug("Trying the signature crypto info"); - } + log.debug("Trying the signature crypto info"); crypto = getSignatureCrypto(config, loader); } return crypto; @@ -360,16 +355,14 @@ public class RampartUtil { public static Crypto getSignatureCrypto(RampartConfig config, ClassLoader loader) throws RampartException { - if (doDebug) { - log.debug("Loading Signature crypto"); - } + log.debug("Loading Signature crypto"); Crypto crypto = null; if (config != null && config.getSigCryptoConfig() != null) { CryptoConfig cryptoConfig = config.getSigCryptoConfig(); String provider = cryptoConfig.getProvider(); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Using provider: " + provider); } Properties prop = cryptoConfig.getProp(); @@ -520,9 +513,7 @@ public class RampartUtil { public static OMElement createRSTTempalteForSCT(int conversationVersion, int wstVersion) throws RampartException { try { - if (doDebug) { - log.debug("Creating RSTTemplate for an SCT request"); - } + log.debug("Creating RSTTemplate for an SCT request"); OMFactory fac = OMAbstractFactory.getOMFactory(); OMNamespace wspNs = fac.createOMNamespace(SPConstants.P_NS, "wsp"); @@ -626,10 +617,8 @@ public class RampartUtil { Policy bsPol = secConvTok.getBootstrapPolicy(); if(bsPol != null) { - if (doDebug) { - log.debug("BootstrapPolicy found"); - } - bsPol.addAssertion(rmd.getPolicyData().getRampartConfig()); + log.debug("BootstrapPolicy found"); + bsPol.addAssertion(rmd.getPolicyData().getRampartConfig()); //copy the <wsoma:OptimizedMimeSerialization/> to BootstrapPolicy if (rmd.getPolicyData().getMTOMAssertion() != null) { bsPol.addAssertion(rmd.getPolicyData().getMTOMAssertion()); @@ -637,16 +626,14 @@ public class RampartUtil { stsPolicy = bsPol; } else { //No bootstrap policy use issuer policy - if (doDebug) { - log.debug("No bootstrap policy, using issuer policy"); - } + log.debug("No bootstrap policy, using issuer policy"); stsPolicy = rmd.getPolicyData().getIssuerPolicy(); } String id = getToken(rmd, rstTemplate, issuerEprAddress, action, stsPolicy); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("SecureConversationToken obtained: id=" + id); } return id; @@ -688,7 +675,7 @@ public class RampartUtil { String id = getToken(rmd, rstTemplate, issuerEprAddress, action, stsPolicy); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Issued token obtained: id=" + id); } return id; @@ -1742,28 +1729,20 @@ public class RampartUtil { if (refreshInterval != null) { if (cachedCrypto.creationTime + new Long(refreshInterval).longValue() > Calendar .getInstance().getTimeInMillis()) { - if (doDebug) { - log.debug("Cache Hit : Crypto Object was found in cache."); - } + log.debug("Cache Hit : Crypto Object was found in cache."); return cachedCrypto.crypto; } else { - if (doDebug) { - log.debug("Cache Miss : Crypto Object found in cache is expired."); - } + log.debug("Cache Miss : Crypto Object found in cache is expired."); return null; } } else { - if (doDebug) { - log.debug("Cache Hit : Crypto Object was found in cache."); - } + log.debug("Cache Hit : Crypto Object was found in cache."); return cachedCrypto.crypto; } } // cache miss else { - if (doDebug) { - log.debug("Cache Miss : Crypto Object was not found in cache."); - } + log.debug("Cache Miss : Crypto Object was not found in cache."); return null; } } @@ -1771,9 +1750,7 @@ public class RampartUtil { private static void cacheCrypto(String cryptoKey, Crypto crypto) { cryptoStore.put(cryptoKey, new CachedCrypto(crypto, Calendar.getInstance() .getTimeInMillis())); - if (doDebug) { - log.debug("Crypto object is inserted into the Cache."); - } + log.debug("Crypto object is inserted into the Cache."); } Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java Sat Feb 19 13:04:52 2011 @@ -27,7 +27,6 @@ public class TokenRequestDispatcher { private static Log mlog = LogFactory.getLog("org.apache.rampart.messages"); private static Log log = LogFactory.getLog(TokenRequestDispatcher.class.getName()); - private static boolean doDebug = log.isDebugEnabled(); public TokenRequestDispatcher(TokenRequestDispatcherConfig config) throws TrustException { this.config = config; @@ -59,9 +58,7 @@ public class TokenRequestDispatcher { String tokenType = data.getTokenType(); if ((RahasConstants.WST_NS_05_02 + RahasConstants.REQ_TYPE_ISSUE).equals(reqType) || (RahasConstants.WST_NS_05_12 + RahasConstants.REQ_TYPE_ISSUE).equals(reqType)) { - if (doDebug) { - log.debug("issue"); - } + log.debug("issue"); TokenIssuer issuer; if (tokenType == null || tokenType.trim().length() == 0) { issuer = config.getDefaultIssuerInstace(); @@ -81,9 +78,7 @@ public class TokenRequestDispatcher { return response; } else if((RahasConstants.WST_NS_05_02 + RahasConstants.REQ_TYPE_VALIDATE).equals(reqType) || (RahasConstants.WST_NS_05_12 + RahasConstants.REQ_TYPE_VALIDATE).equals(reqType)) { - if (doDebug) { - log.debug("validate"); - } + log.debug("validate"); TokenValidator validator; if (tokenType == null || tokenType.trim().length() == 0) { @@ -104,9 +99,7 @@ public class TokenRequestDispatcher { } else if((RahasConstants.WST_NS_05_02 + RahasConstants.REQ_TYPE_RENEW).equals(reqType) || (RahasConstants.WST_NS_05_12 + RahasConstants.REQ_TYPE_RENEW).equals(reqType)) { - if (doDebug) { - log.debug("renew"); - } + log.debug("renew"); TokenRenewer renewer; if (tokenType == null || tokenType.trim().length() == 0) { @@ -125,9 +118,7 @@ public class TokenRequestDispatcher { } else if((RahasConstants.WST_NS_05_02 + RahasConstants.REQ_TYPE_CANCEL).equals(reqType) || (RahasConstants.WST_NS_05_12 + RahasConstants.REQ_TYPE_CANCEL).equals(reqType)) { - if (doDebug) { - log.debug("cancel"); - } + log.debug("cancel"); TokenCanceler canceler = config.getDefaultCancelerInstance(); SOAPEnvelope response = canceler.cancel(data); Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java Sat Feb 19 13:04:52 2011 @@ -77,7 +77,6 @@ public class STSClient { private static final String RAMPART_POLICY = "rampartPolicy"; private static Log log = LogFactory.getLog(STSClient.class); - private static boolean doDebug = log.isDebugEnabled(); private String action; @@ -596,9 +595,7 @@ public class STSClient { //Assumption: there's only one alternative if (issuerPolicy != null) { - if (doDebug) { - log.debug("Processing Issuer policy"); - } + log.debug("Processing Issuer policy"); List issuerAssertions = (List) issuerPolicy.getAlternatives().next(); @@ -607,10 +604,7 @@ public class STSClient { //find the AlgorithmSuite assertion if (tempAssertion instanceof Binding) { - if (doDebug) { - log.debug("Extracting algo suite from issuer " + - "policy binding"); - } + log.debug("Extracting algo suite from issuer policy binding"); this.algorithmSuite = ((Binding) tempAssertion) .getAlgorithmSuite(); @@ -620,9 +614,7 @@ public class STSClient { if (servicePolicy != null) { - if (doDebug) { - log.debug("Processing service policy to find Trust10 assertion"); - } + log.debug("Processing service policy to find Trust10 assertion"); List assertions = (List) servicePolicy.getAlternatives().next(); @@ -630,16 +622,10 @@ public class STSClient { Assertion tempAssertion = (Assertion) iter.next(); //find the Trust10 assertion if (tempAssertion instanceof Trust10) { - if (doDebug) { - log.debug("Extracting Trust10 assertion from " + - "service policy"); - } + log.debug("Extracting Trust10 assertion from service policy"); this.trust10 = (Trust10) tempAssertion; } else if (tempAssertion instanceof Trust13) { - if (doDebug) { - log.debug("Extracting Trust13 assertion from " + - "service policy"); - } + log.debug("Extracting Trust13 assertion from service policy"); this.trust13 = (Trust13) tempAssertion; } } @@ -657,7 +643,7 @@ public class STSClient { private OMElement createIssueRequest(String requestType, String appliesTo) throws TrustException { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Creating request with request type: " + requestType + " and applies to: " + appliesTo); } @@ -673,7 +659,7 @@ public class STSClient { //Copy over the elements from the template if (this.rstTemplate != null) { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Using RSTTemplate: " + this.rstTemplate.toString()); } @@ -686,15 +672,13 @@ public class STSClient { && ((OMElement) child).getQName().equals( new QName(TrustUtil.getWSTNamespace(this.version), RahasConstants.IssuanceBindingLocalNames.KEY_SIZE))) { - if (doDebug) { - log.debug("Extracting key size from the RSTTemplate: "); - } + log.debug("Extracting key size from the RSTTemplate: "); OMElement childElem = (OMElement) child; this.keySize = (childElem.getText() != null && !"".equals(childElem.getText())) ? Integer.parseInt(childElem.getText()) : -1; - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Key size from RSTTemplate: " + this.keySize); } } @@ -705,15 +689,11 @@ public class STSClient { // Handle entropy if (this.trust10 != null) { - if (doDebug) { - log.debug("Processing Trust assertion"); - } + log.debug("Processing Trust assertion"); if (this.trust10.isRequireClientEntropy()) { - if (doDebug) { - log.debug("Requires client entropy"); - } + log.debug("Requires client entropy"); // setup requestor entropy OMElement ent = TrustUtil.createEntropyElement(this.version, rst); @@ -726,7 +706,7 @@ public class STSClient { getMaximumSymmetricKeyLength()/8); binSec.setText(Base64.encode(this.requestorEntropy)); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Clien entropy : " + Base64.encode(this.requestorEntropy)); } @@ -739,9 +719,7 @@ public class STSClient { if (this.trust13.isRequireClientEntropy()) { - if (doDebug) { - log.debug("Requires client entropy"); - } + log.debug("Requires client entropy"); // setup requestor entropy OMElement ent = TrustUtil.createEntropyElement(this.version, rst); @@ -754,7 +732,7 @@ public class STSClient { getMaximumSymmetricKeyLength()/8); binSec.setText(Base64.encode(this.requestorEntropy)); - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Clien entropy : " + Base64.encode(this.requestorEntropy)); } @@ -779,7 +757,7 @@ public class STSClient { private OMElement createValidateRequest(String requestType, String tokenId) throws TrustException { - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Creating request with request type: " + requestType); } @@ -821,7 +799,7 @@ public class STSClient { String requestType = TrustUtil.getWSTNamespace(version) + RahasConstants.REQ_TYPE_RENEW; - if (doDebug) { + if (log.isDebugEnabled()) { log.debug("Creating request with request type: " + requestType); } Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java Sat Feb 19 13:04:52 2011 @@ -522,10 +522,7 @@ public class SAML2TokenIssuer implements //set the subject confirmation subject.getSubjectConfirmations().add(subjectConfirmation); - - if(log.isDebugEnabled()){ - log.debug("SAML2.0 subject is constructed successfully."); - } + log.debug("SAML2.0 subject is constructed successfully."); return subject; } @@ -576,9 +573,7 @@ public class SAML2TokenIssuer implements throw new TrustException("errorMarshellingOrSigning", e); } - if(log.isDebugEnabled()){ - log.debug("SAML2.0 assertion is marshalled and signed.."); - } + log.debug("SAML2.0 assertion is marshalled and signed.."); return assertion; } @@ -632,9 +627,7 @@ public class SAML2TokenIssuer implements throw new TrustException("Error creating issuer signature"); } - if(log.isDebugEnabled()){ - log.debug("SignKeyHolder object is created with the credentials.."); - } + log.debug("SignKeyHolder object is created with the credentials.."); return signKeyHolder; } @@ -709,9 +702,7 @@ public class SAML2TokenIssuer implements //add attributes to the attribute statement attrstmt.getAttributes().addAll(Arrays.asList(attributes)); - if(log.isDebugEnabled()){ - log.debug("SAML2.0 attribute statement is constructed successfully."); - } + log.debug("SAML2.0 attribute statement is constructed successfully."); return attrstmt; } @@ -754,9 +745,7 @@ public class SAML2TokenIssuer implements authContext.setAuthnContextClassRef(authCtxClassRef); authStmt.setAuthnContext(authContext); - if(log.isDebugEnabled()){ - log.debug("SAML2.0 authentication statement is constructed successfully."); - } + log.debug("SAML2.0 authentication statement is constructed successfully."); return authStmt; } Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java?rev=1072321&r1=1072320&r2=1072321&view=diff ============================================================================== --- axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java Sat Feb 19 13:04:52 2011 @@ -101,9 +101,7 @@ public class SAML2Utils { Element assertionElement = document.getDocumentElement(); DocumentBuilderFactoryImpl.setDOOMRequired(false); - if (log.isDebugEnabled()) { - log.debug("DOM element is created successfully from the OpenSAML2 XMLObject"); - } + log.debug("DOM element is created successfully from the OpenSAML2 XMLObject"); return assertionElement; } catch (Exception e) {