You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2013/01/14 21:58:24 UTC

svn commit: r1433126 - /webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java

Author: veithen
Date: Mon Jan 14 20:58:11 2013
New Revision: 1433126

URL: http://svn.apache.org/viewvc?rev=1433126&view=rev
Log:
Dead code elimination (code made obsolete by the elimination of lookahead).

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1433126&r1=1433125&r2=1433126&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Mon Jan 14 20:58:11 2013
@@ -881,21 +881,17 @@ class SwitchingWrapper extends AbstractX
                 node = null;
             }
         } else {
-            if (node instanceof OMDocument) {
-                node = null;
+            OMNode nextNode = (OMNode)node;
+            OMContainer parent = nextNode.getParent();
+            OMNode nextSibling = getNextSibling(nextNode);
+            if (nextSibling != null) {
+                node = nextSibling;
+                visited = false;
+            } else if (parent.isComplete()) {
+                node = parent;
+                visited = true;
             } else {
-                OMNode nextNode = (OMNode)node;
-                OMContainer parent = nextNode.getParent();
-                OMNode nextSibling = getNextSibling(nextNode);
-                if (nextSibling != null) {
-                    node = nextSibling;
-                    visited = false;
-                } else if ((parent != null) && parent.isComplete()) {
-                    node = parent;
-                    visited = true;
-                } else {
-                    node = null;
-                }
+                node = null;
             }
         }
     }