You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ru...@apache.org on 2008/03/02 15:34:06 UTC
svn commit: r632764 - in /webservices/rampart/trunk/java/modules:
rampart-core/src/main/java/org/apache/rampart/
rampart-core/src/main/java/org/apache/rampart/handler/
rampart-core/src/main/java/org/apache/rampart/policy/
rampart-core/src/main/java/org...
Author: ruchithf
Date: Sun Mar 2 06:34:06 2008
New Revision: 632764
URL: http://svn.apache.org/viewvc?rev=632764&view=rev
Log:
More fixes using findbugs
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Sun Mar 2 06:34:06 2008
@@ -649,7 +649,7 @@
// If no certificates have been found, there has to be an error:
// The keystore can find an alias but no certificate(s)
- if (certs == null | certs.length < 1) {
+ if (certs == null || certs.length < 1) {
throw new RampartException("noCertForAlias", new String[] {alias});
}
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java Sun Mar 2 06:34:06 2008
@@ -133,7 +133,10 @@
}
}
- headerBlock.setProcessed();
+ if(headerBlock != null) {
+ headerBlock.setProcessed();
+ }
+
return InvocationResponse.CONTINUE;
}
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java Sun Mar 2 06:34:06 2008
@@ -267,7 +267,9 @@
}
}
- headerBlock.setProcessed();
+ if(headerBlock != null) {
+ headerBlock.setProcessed();
+ }
/*
* Now we can check the certificate used to sign the message. In the
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java Sun Mar 2 06:34:06 2008
@@ -335,7 +335,7 @@
RampartPolicyData rpd) throws WSSPolicyException {
TokenWrapper tokWrapper = binding.getRecipientToken();
TokenWrapper tokWrapper1 = binding.getInitiatorToken();
- if (tokWrapper == null && tokWrapper1 == null) {
+ if (tokWrapper == null || tokWrapper1 == null) {
throw new WSSPolicyException("Asymmetric binding should have both Initiator and " +
"Recipient tokens defined");
}
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sun Mar 2 06:34:06 2008
@@ -335,8 +335,13 @@
!"".equals(issuerAddress.getText())) {
return issuerAddress.getText().trim();
} else {
- throw new RampartException("invalidIssuerAddress",
+ if(issuerAddress != null) {
+ throw new RampartException("invalidIssuerAddress",
new String[] { issuerAddress.toString() });
+ } else {
+ throw new RampartException("invalidIssuerAddress",
+ new String[] { "Issuer address null" });
+ }
}
}
Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java?rev=632764&r1=632763&r2=632764&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java Sun Mar 2 06:34:06 2008
@@ -115,11 +115,6 @@
AlgorithmSuite algorithmSuite = getAlgorithmSuite();
List configurations = algorithmSuite.getConfigurations();
- if (configurations == null && configurations.size() == 1) {
- setNormalized(true);
- return this;
- }
-
Policy policy = new Policy();
ExactlyOne exactlyOne = new ExactlyOne();