You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/06 10:50:39 UTC

svn commit: r1500229 - /jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java

Author: sebb
Date: Sat Jul  6 08:50:39 2013
New Revision: 1500229

URL: http://svn.apache.org/r1500229
Log:
Fix to allow Headless testing

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1500229&r1=1500228&r2=1500229&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Sat Jul  6 08:50:39 2013
@@ -19,6 +19,7 @@
 package org.apache.jmeter.gui.util;
 
 import java.awt.Component;
+import java.awt.HeadlessException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Collection;
@@ -466,7 +467,9 @@ public final class MenuFactory {
                         throw (Error) e;
                     }
                     if (e instanceof RuntimeException){
-                        throw (RuntimeException) e;
+                        if (!(e instanceof HeadlessException)) { // Allow headless testing
+                            throw (RuntimeException) e;
+                        }
                     }
                     continue;
                 }