svn commit: r632758 - in /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart: handler/WSDoAllHandler.java handler/WSDoAllReceiver.java policy/RampartPolicyBuilder.java

[ruchithf]

Author: ruchithf
Date: Sun Mar  2 05:40:04 2008
New Revision: 632758

URL: http://svn.apache.org/viewvc?rev=632758&view=rev
Log:
some issues found using findbugs

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.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

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java?rev=632758&r1=632757&r2=632758&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
 Sun Mar  2 05:40:04 2008
@@ -126,7 +126,7 @@
      */
     public String toString() {
         String name = this.getName();
-        return (name != null) ? name : null;
+        return (name != null) ? name : "";
     }
 
 

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=632758&r1=632757&r2=632758&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 05:40:04 2008
@@ -114,8 +114,6 @@
             throw new AxisFault("Configuration error", e);
         }
 
-        reqData = new RequestData();
-
         reqData.setMsgContext(msgContext);
 
         if (((getOption(WSSHandlerConstants.INFLOW_SECURITY)) == null) &&

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=632758&r1=632757&r2=632758&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 05:40:04 2008
@@ -311,15 +311,15 @@
         if (token != null) {
             
rpd.setProtectionToken(((ProtectionToken)token).getProtectionToken());
         } else {
-            token = binding.getEncryptionToken();
-            Assertion token1 = binding.getSignatureToken();
-            if (token == null && token1 == null) {
+            Assertion encrToken = binding.getEncryptionToken();
+            Assertion sigToken = binding.getSignatureToken();
+            if (token == null && sigToken == null) {
                 throw new WSSPolicyException("Symmetric binding should have a 
Protection token or" +
                                                " both Signature and Encryption 
tokens defined");
             }
             rpd.setEncryptionToken(
-                    ((EncryptionToken) token).getEncryptionToken());
-            rpd.setSignatureToken(((SignatureToken) 
token).getSignatureToken());
+                    ((EncryptionToken) encrToken).getEncryptionToken());
+            rpd.setSignatureToken(((SignatureToken) 
sigToken).getSignatureToken());
         }
     }