svn commit: r653992 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java

[nandana]

Author: nandana
Date: Tue May  6 22:34:54 2008
New Revision: 653992

URL: http://svn.apache.org/viewvc?rev=653992&view=rev
Log:
RAMPART-157 Applied the patch from Stefan Vladov. Thanks Stefan. 

Modified:
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=653992&r1=653991&r2=653992&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
 Tue May  6 22:34:54 2008
@@ -94,14 +94,11 @@
         String localName = getName().getLocalPart();
         String namespaceURI = getName().getNamespaceURI();
 
-        String prefix;
-        String writerPrefix = writer.getPrefix(namespaceURI);
+        String prefix = writer.getPrefix(namespaceURI);
 
-        if (writerPrefix == null) {
+        if (prefix == null) {
             prefix = getName().getPrefix();
             writer.setPrefix(prefix, namespaceURI);
-        } else {
-            prefix = writerPrefix;
         }
 
         // <sp:SignedElements> | <sp:EncryptedElements>
@@ -110,11 +107,6 @@
         // xmlns:sp=".."
         writer.writeNamespace(prefix, namespaceURI);
 
-        if (writerPrefix == null) {
-            // xmlns:sp=".."
-            writer.writeNamespace(prefix, namespaceURI);
-        }
-
         if (xPathVersion != null) {
             writer.writeAttribute(prefix, namespaceURI, 
SPConstants.XPATH_VERSION, xPathVersion);
         }