You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2012/09/04 08:47:54 UTC
svn commit: r1380462 - in /jmeter/trunk/src/core/org/apache/jmeter/control:
GenericController.java NextIsNullException.java
Author: pmouawad
Date: Tue Sep 4 06:47:54 2012
New Revision: 1380462
URL: http://svn.apache.org/viewvc?rev=1380462&view=rev
Log:
Add initial exception
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/control/NextIsNullException.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1380462&r1=1380461&r2=1380462&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Tue Sep 4 06:47:54 2012
@@ -173,6 +173,7 @@ public class GenericController extends A
}
}
} catch (NextIsNullException e) {
+ // NOOP
}
return returnValue;
}
@@ -212,7 +213,7 @@ public class GenericController extends A
// See bug 50618 Catches a StackOverflowError when a condition returns
// always false (after at least one iteration with return true)
log.warn("StackOverflowError detected"); // $NON-NLS-1$
- throw new NextIsNullException();
+ throw new NextIsNullException("StackOverflowError detected", soe);
}
if (sampler == null) {
currentReturnedNull(controller);
@@ -272,6 +273,7 @@ public class GenericController extends A
}
}
} catch (NextIsNullException e) {
+ // NOOP
} finally {
if (wasFlagSet) {
getThreadContext().unsetIsReinitializingSubControllers();
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/NextIsNullException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/NextIsNullException.java?rev=1380462&r1=1380461&r2=1380462&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/NextIsNullException.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/NextIsNullException.java Tue Sep 4 06:47:54 2012
@@ -27,4 +27,20 @@ package org.apache.jmeter.control;
public class NextIsNullException extends Exception {
private static final long serialVersionUID = 240L;
+ public NextIsNullException() {
+ super();
+ }
+
+ public NextIsNullException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public NextIsNullException(String message) {
+ super(message);
+ }
+
+ public NextIsNullException(Throwable cause) {
+ super(cause);
+ }
+
}