Author: sebb
Date: Fri Jan 22 12:54:33 2010
New Revision: 902078
URL: http://svn.apache.org/viewvc?rev=902078&view=rev
Log:
Should not ignore Error or RuntimeException
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=902078&r1=902077&r2=902078&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Fri Jan 22 12:54:33 2010
@@ -139,6 +139,12 @@
} catch (Throwable ex) {
GuiPackage.getInstance().setTestPlanFile(null);
log.error("", ex);
+ if (ex instanceof Error){
+ throw (Error) ex;
+ }
+ if (ex instanceof RuntimeException){
+ throw (RuntimeException) ex;
+ }
throw new IllegalUserActionException("Couldn't save test plan to file: " + updateFile);
} finally {
JOrphanUtils.closeQuietly(ostream);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=902078&r1=902077&r2=902078&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Fri Jan 22 12:54:33 2010
@@ -148,6 +148,12 @@
initializeMenus();
} catch (Throwable e) {
log.error("", e);
+ if (e instanceof Error){
+ throw (Error) e;
+ }
+ if (e instanceof RuntimeException){
+ throw (RuntimeException) e;
+ }
}
}
@@ -430,6 +436,12 @@
continue;
} catch (Throwable e) {
log.warn("Could not instantiate " + name, e);
+ if (e instanceof Error){
+ throw (Error) e;
+ }
+ if (e instanceof RuntimeException){
+ throw (RuntimeException) e;
+ }
continue;
}
if (elementsToSkip.contains(name) || elementsToSkip.contains(item.getStaticLabel())) {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=902078&r1=902077&r2=902078&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java Fri Jan 22 12:54:33 2010
@@ -67,6 +67,12 @@
sampleStore.clear();
} catch (Throwable ex) {
log.warn("testEnded()", ex);
+ if (ex instanceof Error){
+ throw (Error) ex;
+ }
+ if (ex instanceof RuntimeException){
+ throw (RuntimeException) ex;
+ }
}
}
@@ -84,6 +90,12 @@
sampleStore.clear();
} catch (Throwable ex) {
log.error("testEnded(host)", ex);
+ if (ex instanceof Error){
+ throw (Error) ex;
+ }
+ if (ex instanceof RuntimeException){
+ throw (RuntimeException) ex;
+ }
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java?rev=902078&r1=902077&r2=902078&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteListenerWrapper.java Fri Jan 22 12:54:33 2010
@@ -61,6 +61,12 @@
listener.testStarted();
} catch (Throwable ex) {
log.warn("testStarted()", ex);
+ if (ex instanceof Error){
+ throw (Error) ex;
+ }
+ if (ex instanceof RuntimeException){
+ throw (RuntimeException) ex;
+ }
}
}
@@ -75,7 +81,13 @@
listener.testStarted(host);
} catch (Throwable ex) {
log.error("testStarted(host)", ex);
- }
+ if (ex instanceof Error){
+ throw (Error) ex;
+ }
+ if (ex instanceof RuntimeException){
+ throw (RuntimeException) ex;
+ }
+}
}
public void testEnded(String host) {
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=902078&r1=902077&r2=902078&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java Fri Jan 22 12:54:33 2010
@@ -123,6 +123,12 @@
log.error(e.getMessage());
} catch (Throwable e) {
log.error(e.getMessage());
+ if (e instanceof Error){
+ throw (Error) e;
+ }
+ if (e instanceof RuntimeException){
+ throw (RuntimeException) e;
+ }
}
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.