Author: milamber
Date: Mon Jan 10 21:25:49 2011
New Revision: 1057376
URL: http://svn.apache.org/viewvc?rev=1057376&view=rev
Log:
Bug 50568 - Function __FileToString(): Could not read file when encoding option
is blank/empty
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=1057376&r1=1057375&r2=1057376&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
Mon Jan 10 21:25:49 2011
@@ -86,6 +86,9 @@ public class FileToString extends Abstra
String encoding = null;//means platform default
if (values.length >= ENCODING) {
encoding = ((CompoundVariable) values[ENCODING -
1]).execute().trim();
+ if (encoding.length() <= 0) { // empty encoding, return to platorm
default
+ encoding = null;
+ }
}
String myName = "";//$NON-NLS-1$
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1057376&r1=1057375&r2=1057376&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Jan 10 21:25:49 2011
@@ -107,6 +107,7 @@ This is internal to the workings of the
<h3>Functions</h3>
<ul>
+<li>Bug 50568 - Function __FileToString(): Could not read file when encoding
option is blank/empty</li>
</ul>
<h3>I18N</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
