cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r712199 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Date Fri, 07 Nov 2008 17:02:27 GMT
Author: dkulp
Date: Fri Nov  7 09:02:19 2008
New Revision: 712199

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

........
  r712194 | dkulp | 2008-11-07 11:49:07 -0500 (Fri, 07 Nov 2008) | 2 lines
  
  Minor performance improvement be removing a bunch of instanceof things in chained if..else..else..else
things
........

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

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov  7 09:02:19 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710150,710154
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710150,710154,712194

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

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=712199&r1=712198&r2=712199&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Fri Nov  7 09:02:19 2008
@@ -582,22 +582,31 @@
 
     public static void writeNode(Node n, XMLStreamWriter writer, boolean repairing) 
         throws XMLStreamException {
-        if (n instanceof Element) {
+        
+        switch (n.getNodeType()) {
+        case Node.ELEMENT_NODE:
             writeElement((Element)n, writer, repairing);
-        } else if (n instanceof CDATASection) {
-            writer.writeCData(((CDATASection)n).getData());
-        } else if (n instanceof Text) {
+            break;
+        case Node.TEXT_NODE:
             writer.writeCharacters(((Text)n).getNodeValue());
-        } else if (n instanceof Comment) {
+            break;
+        case Node.COMMENT_NODE:
             writer.writeComment(((Comment)n).getData());
-        } else if (n instanceof EntityReference) {
+            break;
+        case Node.CDATA_SECTION_NODE:
+            writer.writeCData(((CDATASection)n).getData());
+            break;
+        case Node.ENTITY_REFERENCE_NODE:
             writer.writeEntityRef(((EntityReference)n).getNodeValue());
-        } else if (n instanceof ProcessingInstruction) {
+            break;
+        case Node.PROCESSING_INSTRUCTION_NODE:
             ProcessingInstruction pi = (ProcessingInstruction)n;
             writer.writeProcessingInstruction(pi.getTarget(), pi.getData());
-        } else if (n instanceof Document) {
+            break;
+        case Node.DOCUMENT_NODE:
             writeDocument((Document)n, writer, repairing);
-        } 
+            break;
+        }        
     }
 
     public static Document read(XMLStreamReader reader) throws XMLStreamException {

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=712199&r1=712198&r2=712199&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
Fri Nov  7 09:02:19 2008
@@ -151,16 +151,16 @@
             content = content.getNextSibling();
             --currentChild;
         }
-        
-        if (content instanceof Element) {
+        switch (content.getNodeType()) {
+        case Node.ELEMENT_NODE:
             return START_ELEMENT;
-        } else if (content instanceof CDATASection) {
-            return CDATA;
-        } else if (content instanceof Comment) {
-            return COMMENT;
-        } else if (content instanceof Text) {
+        case Node.TEXT_NODE:
             return CHARACTERS;
-        } else if (content instanceof EntityReference) {
+        case Node.COMMENT_NODE:
+            return COMMENT;
+        case Node.CDATA_SECTION_NODE:
+            return CDATA;
+        case Node.ENTITY_REFERENCE_NODE:
             return ENTITY_REFERENCE;
         }
 



Mime
View raw message