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 2016/03/04 00:20:44 UTC
svn commit: r1733535 - in /webservices/axiom/trunk/aspects:
core-aspects/src/main/java/org/apache/axiom/core/
core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/
om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/
om-aspects/src/...
Author: veithen
Date: Thu Mar 3 23:20:44 2016
New Revision: 1733535
URL: http://svn.apache.org/viewvc?rev=1733535&view=rev
Log:
Remove the discard debugging code; since we no longer keep a reference to the builder after a node is complete, the code is no longer effective.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/Builder.java Thu Mar 3 23:20:44 2016
@@ -40,6 +40,4 @@ public interface Builder {
void reenableCaching(CoreParentNode container);
void discard(CoreParentNode container);
-
- void debugDiscarded(CoreParentNode container);
}
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreChildNodeSupport.aj Thu Mar 3 23:20:44 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/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/impl/mixin/CoreParentNodeSupport.aj Thu Mar 3 23:20:44 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/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/BuilderHandler.java Thu Mar 3 23:20:44 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/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/PushBuilder.java Thu Mar 3 23:20:44 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/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/builder/StAXOMBuilder.java Thu Mar 3 23:20:44 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/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj?rev=1733535&r1=1733534&r2=1733535&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomContainerSupport.aj Thu Mar 3 23:20:44 2016
@@ -168,9 +168,6 @@ public aspect AxiomContainerSupport {
}
} else {
if (getState() == AxiomContainer.DISCARDED) {
- if (builder != null) {
- builder.debugDiscarded(this);
- }
throw new NodeUnavailableException();
}
if (builder != null && builder.isCompleted()) {