svn commit: r785279 - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java

[dkulp]

Author: dkulp
Date: Tue Jun 16 16:21:17 2009
New Revision: 785279

URL: http://svn.apache.org/viewvc?rev=785279&view=rev
Log:
Fixes for potential issue in IriDecoderHelper and setting namespace on all
elements.

Modified:
    
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
    
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=785279&r1=785278&r2=785279&view=diff
==============================================================================
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Tue Jun 16 16:21:17 2009
@@ -120,9 +120,9 @@
                 if (e.getLocalName().equals("import")) {
                     e.removeAttribute("schemaLocation");
                     updateSchemaLocation(e);
-                }
-                if (StringUtils.isEmpty(e.getAttribute("namespace"))) {
-                    e.setAttribute("namespace", 
serviceInfo.getInterface().getName().getNamespaceURI());
+                    if (StringUtils.isEmpty(e.getAttribute("namespace"))) {
+                        e.setAttribute("namespace", 
serviceInfo.getInterface().getName().getNamespaceURI());
+                    }
                 }
             }
             n = n.getNextSibling();

Modified: 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java?rev=785279&r1=785278&r2=785279&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
 (original)
+++ 
cxf/trunk/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
 Tue Jun 16 16:21:17 2009
@@ -333,8 +333,9 @@
             } else {
                 Node node = ec.getFirstChild();
                 while (node != null) {
+                    Node next = node.getNextSibling();
                     ec.removeChild(node);
-                    node = node.getNextSibling();
+                    node = next;
                 }
             }