Author: pmouawad
Date: Tue Feb 28 16:45:58 2012
New Revision: 1294726
URL: http://svn.apache.org/viewvc?rev=1294726&view=rev
Log:
Bug 52789 - Proxy with Regexp Matching can fail with NullPointerException in
Value Replacement if value is null
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1294726&r1=1294725&r2=1294726&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Tue Feb 28 16:45:58 2012
@@ -70,6 +70,9 @@ public class ReplaceFunctionsWithStrings
Pattern pattern = null;
PatternCompiler compiler = new Perl5Compiler();
String input = prop.getStringValue();
+ if(input == null) {
+ return prop;
+ }
for(Entry<String, String> entry : getVariables().entrySet()){
String key = entry.getKey();
String value = entry.getValue();
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1294726&r1=1294725&r2=1294726&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Feb 28 16:45:58 2012
@@ -111,6 +111,7 @@ When doing replacement of User Defined V
<li>Bug 52762 - Problem with multiples certificates: first index not used
until indexes are restarted</li>
<li>Bug 52741 - TestBeanGUI default values do not work at second time or
later</li>
<li>Bug 52783 - oro.patterncache.size property never used due to early
init</li>
+<li>Bug 52789 - Proxy with Regexp Matching can fail with NullPointerException
in Value Replacement if value is null</li>
</ul>
<!-- =================== Improvements =================== -->
