svn commit: r785296 - in /cxf/branches/2.2.x-fixes: ./ 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 17:03:55 2009
New Revision: 785296

URL: http://svn.apache.org/viewvc?rev=785296&view=rev
Log:
Merged revisions 785279 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r785279 | dkulp | 2009-06-16 12:21:17 -0400 (Tue, 16 Jun 2009) | 2 lines
  
  Fixes for potential issue in IriDecoderHelper and setting namespace on all
  elements.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
    
cxf/branches/2.2.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 16 17:03:55 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784895
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784895,785279

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 16 17:03:55 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784895
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784895,785279

Modified: 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=785296&r1=785295&r2=785296&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
 Tue Jun 16 17:03:55 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/branches/2.2.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java?rev=785296&r1=785295&r2=785296&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
 Tue Jun 16 17:03:55 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;
                 }
             }