svn commit: r1484907 - in /webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull: AbstractWrapper.java Navigator.java PullSerializer.java

[veithen]

Author: veithen
Date: Tue May 21 19:10:48 2013
New Revision: 1484907

URL: http://svn.apache.org/r1484907
Log:
Improved debug logging.

Modified:
    
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
    
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
    
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullSerializer.java

Modified: 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java?rev=1484907&r1=1484906&r2=1484907&view=diff
==============================================================================
--- 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
 (original)
+++ 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/AbstractWrapper.java
 Tue May 21 19:10:48 2013
@@ -291,4 +291,8 @@ abstract class AbstractWrapper extends P
 
     final void restored() {
     }
+    
+    public String toString() {
+        return super.toString() + "[reader=" + reader + "]";
+    }
 }

Modified: 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1484907&r1=1484906&r2=1484907&view=diff
==============================================================================
--- 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
 (original)
+++ 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
 Tue May 21 19:10:48 2013
@@ -880,4 +880,8 @@ final class Navigator extends PullSerial
     void restored() throws XMLStreamException {
         next();
     }
+    
+    public String toString() {
+        return super.toString() + "[cache=" + cache + ",document=" + (rootNode 
instanceof OMDocument) + "]";
+    }
 }

Modified: 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullSerializer.java
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullSerializer.java?rev=1484907&r1=1484906&r2=1484907&view=diff
==============================================================================
--- 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullSerializer.java
 (original)
+++ 
webservices/axiom/trunk/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/PullSerializer.java
 Tue May 21 19:10:48 2013
@@ -62,6 +62,9 @@ public final class PullSerializer extend
 
     public PullSerializer(OMContainer startNode, boolean cache, boolean 
preserveNamespaceContext) {
         state = new Navigator(this, startNode, cache, 
preserveNamespaceContext);
+        if (log.isDebugEnabled()) {
+            log.debug("Pull serializer created; initial state is " + state);
+        }
     }
     
     /**
@@ -77,6 +80,10 @@ public final class PullSerializer extend
         if (log.isDebugEnabled()) {
             log.debug("Switching to state " + newState);
         }
+        internalSwitchState(newState);
+    }
+    
+    private void internalSwitchState(PullSerializerState newState) throws 
XMLStreamException {
         PullSerializerState oldState = state;
         PullSerializerState savedState = this.savedState;
         state = newState;
@@ -120,7 +127,7 @@ public final class PullSerializer extend
             log.debug("Restoring state " + savedState);
         }
         this.savedState = null;
-        switchState(savedState);
+        internalSwitchState(savedState);
         savedState.restored();
     }