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 2005/11/14 01:34:45 UTC
svn commit: r344013 - in /jakarta/jmeter/branches/rel-2-1/src:
core/org/apache/jmeter/gui/action/Load.java
reports/org/apache/jmeter/report/gui/action/ReportLoad.java
Author: sebb
Date: Sun Nov 13 16:34:37 2005
New Revision: 344013
URL: http://svn.apache.org/viewcvs?rev=344013&view=rev
Log:
Fix possible NPE
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java?rev=344013&r1=344012&r2=344013&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/Load.java Sun Nov 13 16:34:37 2005
@@ -114,7 +114,9 @@
JMeterUtils.reportErrorToUser(msg);
} finally {
try {
- reader.close();
+ if (reader!=null) {
+ reader.close();
+ }
} catch (IOException e1) {
// ignored
}
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java?rev=344013&r1=344012&r2=344013&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java Sun Nov 13 16:34:37 2005
@@ -113,7 +113,9 @@
JMeterUtils.reportErrorToUser(msg);
} finally {
try {
- reader.close();
+ if (reader != null) {
+ reader.close();
+ }
} catch (IOException e1) {
// ignored
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org