svn commit: r1775515 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java

[pm...@apache.org]

Author: pmouawad
Date: Wed Dec 21 17:22:28 2016
New Revision: 1775515

URL: http://svn.apache.org/viewvc?rev=1775515&view=rev
Log:
Sonar : Fix errors and code smells

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

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=1775515&r1=1775514&r2=1775515&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 Wed Dec 21 17:22:28 2016
@@ -56,7 +56,6 @@ import org.apache.jmeter.util.JMeterUtil
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
 import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
 /**
@@ -219,9 +218,7 @@ public class Save extends AbstractAction
             log.warn("Error converting subtree "+err);
         }
 
-        FileOutputStream ostream = null;
-        try {
-            ostream = new FileOutputStream(updateFile);
+        try (FileOutputStream ostream = new FileOutputStream(updateFile)){
             SaveService.saveTree(subTree, ostream);
             if (fullSave) { // Only update the stored copy of the tree for a full save
                 subTree = GuiPackage.getInstance().getTreeModel().getTestPlan(); // refetch, because convertSubTree affects it
@@ -241,18 +238,14 @@ public class Save extends AbstractAction
                     log.warn("Failed to delete backup file " + expiredBackupFile.getName()); //$NON-NLS-1$
                 }
             }
-        } catch (Throwable ex) {
+        } catch(RuntimeException | Error ex) {
+            throw ex;
+        }
+        catch (Throwable ex) {
             log.error("Error saving tree:", 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, ex);
-        } finally {
-            JOrphanUtils.closeQuietly(ostream);
-        }
+        } 
+
         GuiPackage.getInstance().updateCurrentGui();
     }