svn commit: r632768 - in /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws: secpolicy11/builders/ secpolicy12/builders/

[ruchithf]

Author: ruchithf
Date: Sun Mar  2 07:08:37 2008
New Revision: 632768

URL: http://svn.apache.org/viewvc?rev=632768&view=rev
Log:
Some more fixes using findbugs ... Nandana please review the sec policy changes

Modified:
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java?rev=632768&r1=632767&r2=632768&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
 Sun Mar  2 07:08:37 2008
@@ -85,10 +85,10 @@
             } else if 
(SPConstants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
                 
asymmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
                 
-            } else if (SPConstants.ENCRYPT_SIGNATURE.equals(name)) {
+            } else if 
(SPConstants.ENCRYPT_SIGNATURE.equals(name.getLocalPart())) {
                 asymmetricBinding.setSignatureProtection(true);
                 
-            } else if (SPConstants.PROTECT_TOKENS.equals(name)) {
+            } else if (SPConstants.PROTECT_TOKENS.equals(name.getLocalPart())) 
{
                 asymmetricBinding.setTokenProtection(true);
                 
             } else if 
(SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java?rev=632768&r1=632767&r2=632768&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
 Sun Mar  2 07:08:37 2008
@@ -44,9 +44,8 @@
         }
         // Extract Issuer
         OMElement issuerElem = 
element.getFirstChildWithName(SP11Constants.ISSUER);
-        Iterator iter = issuerElem.getChildrenWithLocalName("Address");
-        if (issuerElem != null &&  iter.hasNext() ) {
-            OMElement issuerEpr = (OMElement)iter.next();
+        if(issuerElem != null) {
+            OMElement issuerEpr = issuerElem.getFirstChildWithName(new 
QName("Address"));
             issuedToken.setIssuerEpr(issuerEpr);
         }
         

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java?rev=632768&r1=632767&r2=632768&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
 Sun Mar  2 07:08:37 2008
@@ -35,9 +35,8 @@
 
         OMAttribute  includeAttr = 
element.getAttribute(SP11Constants.INCLUDE_TOKEN);
         
-        int inclusion = 
SP11Constants.getInclusionFromAttributeValue(includeAttr.getAttributeValue());
-        
         if(includeAttr != null) {
+            int inclusion = 
SP11Constants.getInclusionFromAttributeValue(includeAttr.getAttributeValue());
             contextToken.setInclusion(inclusion);
         }
 

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java?rev=632768&r1=632767&r2=632768&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
 Sun Mar  2 07:08:37 2008
@@ -91,7 +91,8 @@
             } else if (SP12Constants.PROTECT_TOKENS.equals(name)) {
                 asymmetricBinding.setTokenProtection(true);
                 
-            } else if 
(SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name)) {
+            } else if (SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY
+                    .equals(name.getLocalPart())) {
                 asymmetricBinding.setEntireHeadersAndBodySignatures(true);
             }
         }

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=632768&r1=632767&r2=632768&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
 Sun Mar  2 07:08:37 2008
@@ -64,7 +64,7 @@
             
         } else if (SP12Constants.BODY.equals(name)) {
             parent.setBody(true);            
-        } else if (SPConstants.ATTACHMENTS.equals(name)){
+        } else if (SPConstants.ATTACHMENTS.equals(name.getLocalPart())){
             parent.setAttachments(true);
         }
     }