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/04/23 22:15:41 UTC

svn commit: r1329421 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/Save.java xdocs/changes.xml

Author: pmouawad
Date: Mon Apr 23 20:15:41 2012
New Revision: 1329421

URL: http://svn.apache.org/viewvc?rev=1329421&view=rev
Log:
Bug 52997 - Jmeter should not exit without saving Test Plan if saving before exit fails 

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1329421&r1=1329420&r2=1329421&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Mon Apr 23 20:15:41 2012
@@ -134,9 +134,14 @@ public class Save implements Command {
         }
         FileOutputStream ostream = null;
         try {
+            File outFile = new File(updateFile);
+            if(!outFile.canWrite()) {
+                throw new IllegalUserActionException("File cannot be written: " + outFile.getAbsolutePath());
+            }
             ostream = new FileOutputStream(updateFile);
             SaveService.saveTree(subTree, ostream);
         } catch (Throwable ex) {
+            GuiPackage.getInstance().setDirty(true);
             GuiPackage.getInstance().setTestPlanFile(null);
             log.error("", ex);
             if (ex instanceof Error){

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1329421&r1=1329420&r2=1329421&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Apr 23 20:15:41 2012
@@ -149,6 +149,7 @@ Graph Full Results Listener has been rem
 <li>Bug 52843 - Sample headerSize and bodySize not being accumulated for subsamples</li>
 <li>Bug 52967 - The function __P() couldn't use default value when running with remote server in GUI mode.</li>
 <li>Bug 50799 - Having a non-HTTP sampler in a http test plan prevents multiple header managers from working</li>
+<li>Bug 52997 - Jmeter should not exit without saving Test Plan if saving before exit fails</li>
 </ul>
 
 <!-- =================== Improvements =================== -->