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 2012/04/24 00:25:54 UTC

svn commit: r1329484 - in /jmeter/trunk/src/reports/org/apache/jmeter: gui/util/ReportMenuFactory.java report/gui/action/ReportSave.java

Author: sebb
Date: Mon Apr 23 22:25:54 2012
New Revision: 1329484

URL: http://svn.apache.org/viewvc?rev=1329484&view=rev
Log:
Bug 53136 - Catching Throwable needs to be carefully handled
No need to catch Throwable here

Modified:
    jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java

Modified: jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java?rev=1329484&r1=1329483&r2=1329484&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuFactory.java Mon Apr 23 22:25:54 2012
@@ -93,7 +93,7 @@ public final class ReportMenuFactory {
             }
 
             initializeMenus();
-        } catch (Throwable e) {
+        } catch (Exception e) {
             log.error("", e);
         }
     }
@@ -280,7 +280,7 @@ public final class ReportMenuFactory {
                 } catch (NoClassDefFoundError e) {
                     log.warn("Missing jar? Could not create " + name + ". " + e);
                     continue;
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     log.warn("Could not instantiate " + name, e);
                     continue;
                 }

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java?rev=1329484&r1=1329483&r2=1329484&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java Mon Apr 23 22:25:54 2012
@@ -110,7 +110,7 @@ public class ReportSave implements Comma
             ostream = new FileOutputStream(updateFile);
             SaveService.saveTree(subTree, ostream);
             log.info("saveTree");
-        } catch (Throwable ex) {
+        } catch (Exception ex) {
             ReportGuiPackage.getInstance().setReportPlanFile(null);
             log.error("", ex);
             throw new IllegalUserActionException("Couldn't save test plan to file: " + updateFile);