svn commit: r633769 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java

[nandana]

Author: nandana
Date: Tue Mar  4 21:18:07 2008
New Revision: 633769

URL: http://svn.apache.org/viewvc?rev=633769&view=rev
Log:
Fixed an error extracting the address element

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

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=633769&r1=633768&r2=633769&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
 Tue Mar  4 21:18:07 2008
@@ -45,15 +45,27 @@
         // Extract Issuer
         OMElement issuerElem = 
element.getFirstChildWithName(SP11Constants.ISSUER);
         if(issuerElem != null) {
-            OMElement issuerEpr = issuerElem.getFirstChildWithName(new 
QName("Address"));
+            OMElement issuerEpr = issuerElem.getFirstChildWithName(new 
QName(AddressingConstants.Final.WSA_NAMESPACE,"Address"));
+            
+            //try the other addressing namespace
+            if (issuerEpr == null) {
+                issuerEpr = issuerElem.getFirstChildWithName(new 
QName(AddressingConstants.Submission.WSA_NAMESPACE,"Address"));
+            }
+            
             issuedToken.setIssuerEpr(issuerEpr);
         }
         
         //TODO check why this returns an Address element
         //iter = issuerElem.getChildrenWithLocalName("Metadata");
         
-        OMElement issuerMex = issuerElem.getFirstChildWithName(new 
QName(AddressingConstants.Final.WSA_NAMESPACE,"Metadata"));
-        if (issuerElem != null &&  issuerMex != null ) {
+        if (issuerElem != null ) {
+            OMElement issuerMex = issuerElem.getFirstChildWithName(new 
QName(AddressingConstants.Final.WSA_NAMESPACE,"Metadata"));
+            
+          //try the other addressing namespace
+            if (issuerMex == null) {
+                issuerMex = issuerElem.getFirstChildWithName(new 
QName(AddressingConstants.Submission.WSA_NAMESPACE,"Metadata"));
+            }
+                        
             issuedToken.setIssuerMex(issuerMex);
         }