You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2004/09/18 22:03:13 UTC

cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/gui/action Start.java

sebb        2004/09/18 13:03:13

  Modified:    src/core/org/apache/jmeter/gui/action Tag: rel-2_0
                        Start.java
  Log:
  Fix possible NPE
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.13.2.1  +14 -8     jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java
  
  Index: Start.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- Start.java	13 Feb 2004 02:40:54 -0000	1.13
  +++ Start.java	18 Sep 2004 20:03:13 -0000	1.13.2.1
  @@ -80,15 +80,21 @@
           }
           else if (e.getActionCommand().equals(JMeterMenuBar.ACTION_STOP))
           {
  -            GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
  -            engine.stopTest();
  -            engine = null;
  +        	if (engine != null)
  +        	{
  +	            GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
  +	            engine.stopTest();
  +	            engine = null;
  +        	}
           }
           else if (e.getActionCommand().equals(JMeterMenuBar.ACTION_SHUTDOWN))
           {
  -        	GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
  -        	engine.askThreadsToStop();
  -        	engine = null;
  +        	if (engine != null)
  +        	{
  +	        	GuiPackage.getInstance().getMainFrame().showStoppingMessage("");
  +	        	engine.askThreadsToStop();
  +	        	engine = null;
  +        	}
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org