You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/06/16 19:22:13 UTC
svn commit: r785306 - in /cxf/branches/2.1.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
Author: dkulp
Date: Tue Jun 16 17:22:13 2009
New Revision: 785306
URL: http://svn.apache.org/viewvc?rev=785306&view=rev
Log:
Merged revisions 785296 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r785296 | dkulp | 2009-06-16 13:03:55 -0400 (Tue, 16 Jun 2009) | 10 lines
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
cxf/branches/2.1.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 16 17:22:13 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=785306&r1=785305&r2=785306&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java (original)
+++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java Tue Jun 16 17:22:13 2009
@@ -98,9 +98,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.1.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java?rev=785306&r1=785305&r2=785306&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java (original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/IriDecoderHelper.java Tue Jun 16 17:22:13 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;
}
}