Author: sebb
Date: Sun Jan 21 16:03:03 2007
New Revision: 498496
URL: http://svn.apache.org/viewvc?view=rev&rev=498496
Log:
Bug 40100 - check FileServer type before calling close
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/services/FileServer.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/services/FileServer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/services/FileServer.java?view=diff&rev=498496&r1=498495&r2=498496
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/services/FileServer.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/services/FileServer.java
Sun Jan 21 16:03:03 2007
@@ -192,7 +192,13 @@
private void closeFile(String name, FileEntry fileEntry) throws
IOException {
if (fileEntry != null && fileEntry.inputOutputObject != null) {
log.info("Close: "+name);
- ((Reader) fileEntry.inputOutputObject).close();
+ if (fileEntry.inputOutputObject instanceof Reader) {
+ ((Reader) fileEntry.inputOutputObject).close();
+ } else if (fileEntry.inputOutputObject instanceof Writer) {
+ ((Writer) fileEntry.inputOutputObject).close();
+ } else {
+ log.error("Unknown inputOutputObject type : " +
fileEntry.inputOutputObject.getClass());
+ }
fileEntry.inputOutputObject = null;
}
}
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=498496&r1=498495&r2=498496
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Jan 21 16:03:03 2007
@@ -70,6 +70,7 @@
<li>Bug 41414 - Mac OS X may add extra item to -jar classpath</li>
<li>Fix NPE when saving thread counts in remote testing</li>
<li>Bug 34261 - NPE in HtmlParser (allow for missing attributes)</li>
+<li>Bug 40100 - check FileServer type before calling close</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
