ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1733536 - in /webservices/axiom/branches/stax-stream: ./ aspects/core-aspects/src/main/java/org/apache/axiom/core/ aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/ aspects/om-aspects/src/main/java/org/apache/axiom/om/im...
Date Thu, 03 Mar 2016 23:22:57 GMT
Author: veithen
Date: Thu Mar  3 23:22:56 2016
New Revision: 1733536

URL: http://svn.apache.org/viewvc?rev=1733536&view=rev
Log:
Merge latest changes from trunk.

Modified:
    webservices/axiom/branches/stax-stream/   (props changed)
    webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
    webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
    webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
    webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
    webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
    webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
    webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj

Propchange: webservices/axiom/branches/stax-stream/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  3 23:22:56 2016
@@ -14,3 +14,4 @@
 /webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
+/webservices/axiom/trunk:1733528-1733535

Modified: webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
(original)
+++ webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
Thu Mar  3 23:22:56 2016
@@ -40,6 +40,4 @@ public interface Builder {
     void reenableCaching(CoreParentNode container);
 
     void discard(CoreParentNode container);
-
-    void debugDiscarded(CoreParentNode container);
 }

Modified: webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
(original)
+++ webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
Thu Mar  3 23:22:56 2016
@@ -120,7 +120,6 @@ public aspect CoreChildNodeSupport {
             if (parent != null && parent.coreGetBuilder() != null) {
                 switch (parent.getState()) {
                     case CoreParentNode.DISCARDED:
-                        parent.coreGetBuilder().debugDiscarded(parent);
                         throw new NodeConsumedException();
                     case CoreParentNode.INCOMPLETE:
                         do {

Modified: webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
(original)
+++ webservices/axiom/branches/stax-stream/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
Thu Mar  3 23:22:56 2016
@@ -145,7 +145,6 @@ public aspect CoreParentNodeSupport {
         if (firstChild == null) {
             switch (getState()) {
                 case CoreParentNode.DISCARDED:
-                    coreGetBuilder().debugDiscarded(this);
                     throw new NodeConsumedException();
                 case CoreParentNode.INCOMPLETE:
                     do {

Modified: webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
(original)
+++ webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
Thu Mar  3 23:22:56 2016
@@ -19,9 +19,7 @@
 package org.apache.axiom.om.impl.common.builder;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.Queue;
 
 import javax.xml.stream.XMLStreamConstants;
@@ -59,12 +57,6 @@ public final class BuilderHandler implem
      */
     public int depth;
     
-    /**
-     * Stores the stack trace of the code that caused a node to be discarded or consumed.
This is
-     * only used if debug logging was enabled when builder was created.
-     */
-    public Map<CoreParentNode,Throwable> discardTracker = log.isDebugEnabled() ? new
LinkedHashMap<CoreParentNode,Throwable>() : null;
-    
     private ArrayList<BuilderListener> listeners;
     private Queue<Runnable> deferredListenerActions;
 

Modified: webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
(original)
+++ webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
Thu Mar  3 23:22:56 2016
@@ -110,8 +110,4 @@ public final class PushBuilder extends A
     public final void discard(CoreParentNode container) {
         throw new UnsupportedOperationException();
     }
-
-    @Override
-    public final void debugDiscarded(CoreParentNode container) {
-    }
 }

Modified: webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
(original)
+++ webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
Thu Mar  3 23:22:56 2016
@@ -80,18 +80,6 @@ public class StAXOMBuilder extends Abstr
     
     private void discarded(CoreParentNode container) {
         ((AxiomContainer)container).discarded();
-        if (builderHandler.discardTracker != null) {
-            builderHandler.discardTracker.put(container, new Throwable());
-        }
-    }
-    
-    public final void debugDiscarded(CoreParentNode container) {
-        if (log.isDebugEnabled() && builderHandler.discardTracker != null) {
-            Throwable t = builderHandler.discardTracker.get(container);
-            if (t != null) {
-                log.debug("About to throw NodeUnavailableException. Location of the code
that caused the node to be discarded/consumed:", t);
-            }
-        }
     }
     
     // For compatibility only

Modified: webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1733536&r1=1733535&r2=1733536&view=diff
==============================================================================
--- webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
(original)
+++ webservices/axiom/branches/stax-stream/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
Thu Mar  3 23:22:56 2016
@@ -178,9 +178,6 @@ public aspect AxiomContainerSupport {
             }
         } else {
             if (getState() == AxiomContainer.DISCARDED) {
-                if (builder != null) {
-                    builder.debugDiscarded(this);
-                }
                 throw new NodeUnavailableException();
             }
             if (builder != null && builder.isCompleted()) {



Mime
View raw message