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/13 14:52:07 UTC
svn commit: r1432618 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common:
OMNavigator.java SwitchingWrapper.java
Author: veithen
Date: Sun Jan 13 13:52:07 2013
New Revision: 1432618
URL: http://svn.apache.org/viewvc?rev=1432618&view=rev
Log:
Some code simplifications.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNavigator.java
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/OMNavigator.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/OMNavigator.java?rev=1432618&r1=1432617&r2=1432618&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNavigator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNavigator.java Sun Jan 13 13:52:07 2013
@@ -234,11 +234,7 @@ public class OMNavigator {
* @return Returns boolean.
*/
public boolean isNavigable() {
- if (end) {
- return false;
- } else {
- return !(next == null);
- }
+ return !end && next != null;
}
/**
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=1432618&r1=1432617&r2=1432618&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 Sun Jan 13 13:52:07 2013
@@ -192,7 +192,7 @@ class SwitchingWrapper extends AbstractX
// returns the starting node at the first call to it
currentNode = navigator.getNext();
- updateNextNode(!cache);
+ updateNextNode();
if (startNode instanceof OMDocument) {
currentEvent = -1;
try {
@@ -973,15 +973,15 @@ class SwitchingWrapper extends AbstractX
attributeCount = -1;
namespaceCount = -1;
currentNode = nextNode;
- updateNextNode(!cache);
+ updateNextNode();
}
/** Method updateNextNode. */
- private void updateNextNode(boolean switchingAllowed) {
+ private void updateNextNode() {
if (navigator.isNavigable()) {
nextNode = navigator.getNext();
} else {
- if (!switchingAllowed) {
+ if (cache) {
if (navigator.isCompleted() || builder == null || builder.isCompleted()) {
nextNode = null;
if (log.isDebugEnabled()) {