From 7dbd98710eb06aa47e7a7eba07e79a3d04f692cf Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 31 Jul 2007 12:47:36 +0000
Subject: [PATCH] SWS-152

---
 .../ws/soap/saaj/support/SaajUtils.java           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
index 4b78191e..10530393 100644
--- a/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
+++ b/core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
@@ -104,8 +104,8 @@ public abstract class SaajUtils {
     }
 
     /**
-     * Returns the SAAJ version as a String. The returned string will be "<code>SAAJ 1.3</code>",
-     * "<code>SAAJ 1.2</code>", or "<code>SAAJ 1.1</code>".
+     * Returns the SAAJ version as a String. The returned string will be "<code>SAAJ 1.3</code>", "<code>SAAJ
+     * 1.2</code>", or "<code>SAAJ 1.1</code>".
      *
      * @return a string representation of the SAAJ version
      * @see #getSaajVersion()
@@ -126,8 +126,7 @@ public abstract class SaajUtils {
     }
 
     /**
-     * Converts a <code>javax.xml.namespace.QName</code> to a <code>javax.xml.soap.Name</code>. A
-     * <code>SOAPElement</code> is required to create the name.
+     * Converts a {@link QName} to a {@link Name}. A {@link SOAPElement} is required to resolve namespaces.
      *
      * @param qName          the <code>QName</code> to convert
      * @param resolveElement a <code>SOAPElement</code> used to resolve namespaces to prefixes
@@ -142,7 +141,13 @@ public abstract class SaajUtils {
             return envelope.createName(qName.getLocalPart(), qNamePrefix, qName.getNamespaceURI());
         }
         else if (StringUtils.hasLength(qName.getNamespaceURI())) {
-            Iterator prefixes = resolveElement.getVisibleNamespacePrefixes();
+            Iterator prefixes;
+            if (getSaajVersion() == SAAJ_11) {
+                prefixes = resolveElement.getNamespacePrefixes();
+            }
+            else {
+                prefixes = resolveElement.getVisibleNamespacePrefixes();
+            }
             while (prefixes.hasNext()) {
                 String prefix = (String) prefixes.next();
                 if (qName.getNamespaceURI().equals(resolveElement.getNamespaceURI(prefix))) {