Author: samisa
Date: Wed Dec 22 07:14:06 2010
New Revision: 1051779
URL: http://svn.apache.org/viewvc?rev=1051779&view=rev
Log:
Fixed some bugs found with find-bugs
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.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
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -42,8 +42,8 @@ public class EncryptedElementsBuilder im
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedElements.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -52,8 +52,8 @@ public class EncryptedPartsBuilder imple
OMAttribute isOptional = element
.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedParts.setOptional((new Boolean(isOptional
- .getAttributeValue()).booleanValue()));
+
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
+ .getAttributeValue()).booleanValue());
}
return signedEncryptedParts;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -43,8 +43,8 @@ public class SignedElementsBuilder imple
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedElements.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -36,8 +36,8 @@ public class SignedPartsBuilder implemen
SignedEncryptedParts signedEncryptedParts = new
SignedEncryptedParts(true, SPConstants.SP_V11);
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedParts.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
processElement((OMElement) iterator.next(), signedEncryptedParts);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
Wed Dec 22 07:14:06 2010
@@ -55,8 +55,8 @@ public class SupportingTokensBuilder imp
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- supportingToken.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
Wed Dec 22 07:14:06 2010
@@ -47,8 +47,8 @@ public class UsernameTokenBuilder implem
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- usernameToken.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
OMElement policyElement = element.getFirstElement();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
Wed Dec 22 07:14:06 2010
@@ -63,8 +63,8 @@ public class X509TokenBuilder implements
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- x509Token.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -47,8 +47,8 @@ public class EncryptedElementsBuilder im
OMAttribute isOptional = element
.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedElements.setOptional((new
Boolean(isOptional
- .getAttributeValue()).booleanValue()));
+
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional
+ .getAttributeValue()).booleanValue());
}
return signedEncryptedElements;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -52,8 +52,8 @@ public class EncryptedPartsBuilder imple
OMAttribute isOptional = element
.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedParts.setOptional((new Boolean(isOptional
- .getAttributeValue()).booleanValue()));
+
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
+ .getAttributeValue()).booleanValue());
}
return signedEncryptedParts;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -44,8 +44,8 @@ public class SignedElementsBuilder imple
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedElements.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
Wed Dec 22 07:14:06 2010
@@ -41,8 +41,8 @@ public class SignedPartsBuilder implemen
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- signedEncryptedParts.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
//presense of <sp:SignedParts/> enforces the requirement for sign body
and all the header blocks
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
Wed Dec 22 07:14:06 2010
@@ -71,8 +71,8 @@ public class SupportingTokensBuilder imp
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- supportingToken.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
Wed Dec 22 07:14:06 2010
@@ -47,8 +47,8 @@ public class UsernameTokenBuilder implem
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- usernameToken.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
OMElement policyElement = element.getFirstElement();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java?rev=1051779&r1=1051778&r2=1051779&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
Wed Dec 22 07:14:06 2010
@@ -62,8 +62,8 @@ public class X509TokenBuilder implements
OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
if (isOptional != null) {
- x509Token.setOptional((new
Boolean(isOptional.getAttributeValue())
- .booleanValue()));
+
x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+ .booleanValue());
}
if (policyElement != null) {
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=1051779&r1=1051778&r2=1051779&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
Wed Dec 22 07:14:06 2010
@@ -917,7 +917,7 @@ public class STSClient {
this.rstTemplate = rstTemplate;
}
- private class CBHandler implements CallbackHandler {
+ private static class CBHandler implements CallbackHandler {
private String passwd;
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=1051779&r1=1051778&r2=1051779&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
Wed Dec 22 07:14:06 2010
@@ -456,10 +456,9 @@ public class SAML2TokenIssuer implements
x509CertElem.appendChild(base64CertText);
Element x509DataElem = doc.createElementNS(WSConstants.SIG_NS,
"ds:X509Data");
- x509DataElem.appendChild(x509CertElem);
-
-
+
if (x509DataElem != null) {
+ x509DataElem.appendChild(x509CertElem);
keyInfoElem = doc.createElementNS(WSConstants.SIG_NS,
"ds:KeyInfo");
((OMElement) x509DataElem).declareNamespace(
WSConstants.SIG_NS, WSConstants.SIG_PREFIX);
