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 2013/07/12 02:40:10 UTC
svn commit: r1502404 - in /jmeter/trunk:
src/core/org/apache/jmeter/util/BeanShellClient.java xdocs/changes.xml
Author: sebb
Date: Fri Jul 12 00:40:10 2013
New Revision: 1502404
URL: http://svn.apache.org/r1502404
Log:
BeanShell Client jar throws exceptions after upgrading to 2.8
Bugzilla Id: 55242
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java?rev=1502404&r1=1502403&r2=1502404&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java Fri Jul 12 00:40:10 2013
@@ -25,7 +25,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
-import org.apache.jorphan.util.JOrphanUtils;
+// N.B. Do not call any JMeter methods; the jar is standalone
/**
@@ -108,7 +108,12 @@ public class BeanShellClient {
// TODO Why empty block ?
} finally {
System.out.println("... disconnected from server.");
- JOrphanUtils.closeQuietly(is);
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e) {
+ }
+ }
}
}
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1502404&r1=1502403&r2=1502404&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Jul 12 00:40:10 2013
@@ -205,6 +205,7 @@ Transaction Controller now sets Response
<li><bugzilla>55187</bugzilla> - Integer overflow when computing ONE_YEAR_MS in HTTP CacheManager</li>
<li><bugzilla>55208</bugzilla> - JSR223 language entries are duplicated; fold to lower case</li>
<li><bugzilla>55203</bugzilla> - TestBeanGUI - wrong language settings found</li>
+<li><bugzilla>55242</bugzilla> - BeanShell Client jar throws exceptions after upgrading to 2.8</li>
</ul>
<!-- =================== Improvements =================== -->