Author: samisa
Date: Wed Dec 22 06:10:09 2010
New Revision: 1051764
URL: http://svn.apache.org/viewvc?rev=1051764&view=rev
Log:
Fixed some bugs found with find-bugs
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
Wed Dec 22 06:10:09 2010
@@ -39,19 +39,24 @@ public class NonceCache extends Abstract
@Override
public boolean equals(Object another)
{
+ if (another == null){
+ return false;
+ }
+
+ if (another == this) {
+ return true;
+ }
+
+ if (!(another instanceof Nonce)){
+ return false;
+ }
+
+
Nonce otherNonce = (Nonce)another;
- if (this.userName.equals(otherNonce.userName))
+ if (this.userName.equals(otherNonce.userName) &&
this.nonceValue.equals(otherNonce.nonceValue))
{
- if (this.nonceValue.equals(otherNonce.nonceValue))
- {
- return true;
- }
- else
- {
- return false;
- }
+ return true;
}
-
return false;
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Wed Dec 22 06:10:09 2010
@@ -399,7 +399,7 @@ public class PolicyBasedResultsValidator
.get(WSSecurityEngineResult.TAG_ACTION);
int action = actInt.intValue();
if(WSConstants.SIGN == action || WSConstants.ENCR == action) {
- sigEncrActions.add(new Integer(action));
+ sigEncrActions.add(Integer.valueOf(action));
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
Wed Dec 22 06:10:09 2010
@@ -257,7 +257,7 @@ public class WSDoAllSender extends WSDoA
// of the same handler
repetition++;
msgContext.setProperty(WSSHandlerConstants.CURRENT_REPETITON,
- new Integer(repetition));
+ Integer.valueOf(repetition));
this.invoke(msgContext);
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
Wed Dec 22 06:10:09 2010
@@ -149,7 +149,7 @@ public class HandlerParameterDecoder {
}
msgCtx.setProperty(WSSHandlerConstants.SENDER_REPEAT_COUNT,
- new Integer(repetitionCount));
+ Integer.valueOf(repetitionCount));
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java?rev=1051764&r1=1051763&r2=1051764&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
Wed Dec 22 06:10:09 2010
@@ -25,7 +25,7 @@ public abstract class AbstractSecurityAs
private boolean isOptional;
- private boolean normalized = false;
+ private boolean normalized = true;
protected int version;
@@ -50,7 +50,7 @@ public abstract class AbstractSecurityAs
}
public boolean isNormalized() {
- return true;
+ return this.normalized;
}
public PolicyComponent normalize() {
