cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r684854 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Date Mon, 11 Aug 2008 18:05:42 GMT
Author: dkulp
Date: Mon Aug 11 11:05:41 2008
New Revision: 684854

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

........
  r684842 | dkulp | 2008-08-11 13:53:31 -0400 (Mon, 11 Aug 2008) | 2 lines
  
  Update DOMStreamReader to properly consider whitespace.
........

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

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 11 11:05:41 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 11 11:05:41 2008
@@ -1 +1 @@
-/cxf/trunk:1-684818
+/cxf/trunk:1-684853

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java?rev=684854&r1=684853&r2=684854&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Mon Aug 11 11:05:41 2008
@@ -250,6 +250,16 @@
      * @see javax.xml.stream.XMLStreamReader#isWhiteSpace()
      */
     public boolean isWhiteSpace() {
+        if (currentEvent == CHARACTERS || currentEvent == CDATA) {
+            String text = getText();
+            int len = text.length();
+            for (int i = 0; i < len; ++i) {
+                if (text.charAt(i) > 0x0020) {
+                    return false;
+                }
+            }
+            return true;
+        }
         return currentEvent == SPACE;
     }
 



Mime
View raw message