Author: sebb
Date: Wed May 17 15:03:32 2006
New Revision: 407386
URL: http://svn.apache.org/viewvc?rev=407386&view=rev
Log:
Check for wrong class
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java?rev=407386&r1=407385&r2=407386&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java
(original)
+++
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java
Wed May 17 15:03:32 2006
@@ -23,11 +23,16 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.HashTreeTraverser;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* @version $Revision$
*/
public class DisabledComponentRemover implements HashTreeTraverser {
+
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
HashTree tree;
LinkedList stack = new LinkedList();
@@ -41,7 +46,12 @@
}
public void subtractNode() {
- TestElement lastNode = (TestElement) stack.removeLast();
+ Object removeLast = stack.removeLast();
+ if (!(removeLast instanceof TestElement)) {
+ log.warn("Expected class TestElement, found
"+removeLast.getClass().getName());
+ return;
+ }
+ TestElement lastNode = (TestElement) removeLast;
if (!lastNode.getPropertyAsBoolean(TestElement.ENABLED)) {
tree.getTree(stack).remove(lastNode);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
