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 na...@apache.org on 2008/05/07 07:37:13 UTC

svn commit: r653993 - /webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java

Author: nandana
Date: Tue May  6 22:37:12 2008
New Revision: 653993

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

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

Modified: webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=653993&r1=653992&r2=653993&view=diff
==============================================================================
--- webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java (original)
+++ webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java Tue May  6 22:37:12 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);
         }