Author: sebb
Date: Fri Jun 13 17:08:56 2008
New Revision: 667698

URL: http://svn.apache.org/viewvc?rev=667698&view=rev
Log:
Protect against possible NPE

Modified:
    
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java

Modified: 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=667698&r1=667697&r2=667698&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
 (original)
+++ 
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
 Fri Jun 13 17:08:56 2008
@@ -286,7 +286,9 @@
 
                if (myName.length() > 0) {
             JMeterVariables vars = getVariables();
-                       vars.put(myName, myValue);
+                       if (vars != null) {// Can be null if called from Config 
item testEnded() method
+                           vars.put(myName, myValue);
+                       }
                }
 
                if (log.isDebugEnabled()) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to