root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Bug 58913 - When closing jmeter should not interpret cancel as "destroy my test plan" 

#resolve #88
Bugzilla Id: 58913

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1726686 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Philippe Mouawad 2016-01-25 20:50:19 +00:00
parent 4f208f5c5b
commit 3457f7cc87
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/org/apache/jmeter/gui/action/Close.java
View File

@ -80,12 +80,17 @@ public class Close implements Command {
GuiPackage guiPackage = GuiPackage.getInstance();
if (guiPackage.isDirty()) {
int response;
if ((response=JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
if ((response = JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("cancel_new_to_save"), // $NON-NLS-1$
JMeterUtils.getResString("save?"), // $NON-NLS-1$
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE)) == JOptionPane.YES_OPTION) {
ActionRouter.getInstance().doActionNow(new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
// the user might cancel the file chooser dialog
// in this case we should not close the test plan
if (guiPackage.isDirty()) {
return false;
}
}
if (response == JOptionPane.CLOSED_OPTION || response == JOptionPane.CANCEL_OPTION) {
return false; // Don't clear the plan

3
xdocs/changes.xml
View File

@ -272,10 +272,11 @@ Summary
<li><bug>57731</bug>TESTSTART.MS has always the value of the first Test started in Server mode in NON GUI Distributed testing</li>
<li><bug>58016</bug> Error type casting using external SSL Provider. Contributed by Kirill Yankov (myworkpostbox at gmail.com)</li>
<li><bug>58293</bug>SOAP/XML-RPC Sampler file browser generates NullPointerException</li>
<li><bug>58685</bug>JDatefield : Make the modification of the date with up/down arrow work.Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58685</bug>JDatefield : Make the modification of the date with up/down arrow work. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58693</bug>Fix "Cannot nest output folder 'jmeter/build/components' inside output folder 'jmeter/build' when setting up eclipse</li>
<li><bug>58781</bug>Command line option "-?" shows Unknown option</li>
<li><bug>58795</bug>NPE may occur in GuiPackage#getTestElementCheckSum with some 3rd party plugins</li>
<li><bug>58913</bug>When closing jmeter should not interpret cancel as "destroy my test plan". Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
</ul>
<!-- =================== Thanks =================== -->