cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1413509 - in /cxf/branches/2.4.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Date Mon, 26 Nov 2012 08:46:04 GMT
Author: ffang
Date: Mon Nov 26 08:46:04 2012
New Revision: 1413509

URL: http://svn.apache.org/viewvc?rev=1413509&view=rev
Log:
Merged revisions 1413506 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1413506 | ffang | 2012-11-26 16:34:59 +0800 (δΈ€, 26 11 2012) | 1 line
  
  [CXF-4652]Additional namespace is added when web service provider implements Provider<DOMSource>
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.5.x-fixes:r1413506

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=1413509&r1=1413508&r2=1413509&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
(original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Mon Nov 26 08:46:04 2012
@@ -370,6 +370,9 @@ public class W3CDOMStreamReader extends 
         String ln = getCurrentNode().getLocalName();
         if (ln == null) {
             ln = getCurrentNode().getNodeName();
+            if (ln.indexOf(":") != -1) {
+                ln = ln.substring(ln.indexOf(":") + 1);
+            }
         }
         return ln;
     }
@@ -391,7 +394,12 @@ public class W3CDOMStreamReader extends 
     public String getPrefix() {
         String prefix = getCurrentNode().getPrefix();
         if (prefix == null) {
-            prefix = "";
+            String nodeName = getCurrentNode().getNodeName();
+            if (nodeName.indexOf(":") != -1) {
+                prefix = nodeName.substring(0, nodeName.indexOf(":"));
+            }  else {
+                prefix = "";
+            }
         }
         return prefix;
     }



Mime
View raw message