Author: fschumacher
Date: Sun Jul 16 12:53:15 2017
New Revision: 1802053
URL: http://svn.apache.org/viewvc?rev=1802053&view=rev
Log:
Check for null before using value in a regex match.
Bugzilla Id: 61292
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java?rev=1802053&r1=1802052&r2=1802053&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
Sun Jul 16 12:53:15 2017
@@ -444,7 +444,7 @@ public class ReportGenerator {
for (Map.Entry<String, Long[]> entry :
configuration.getApdexPerTransaction().entrySet()) {
org.apache.oro.text.regex.Pattern regex =
JMeterUtils.getPatternCache().getPattern(entry.getKey());
PatternMatcher matcher = JMeterUtils.getMatcher();
- if (matcher.matches(sampleName, regex)) {
+ if (sampleName != null && matcher.matches(sampleName,
regex)) {
Long satisfied = entry.getValue()[0];
Long tolerated = entry.getValue()[1];
if(log.isDebugEnabled()) {
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1802053&r1=1802052&r2=1802053&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Jul 16 12:53:15 2017
@@ -204,6 +204,7 @@ Summary
<li><bug>61100</bug>Invalid GC Log Filename on Windows</li>
<li><bug>57962</bug>Allow to use variables ( from User Defined Variables
only ) in all listeners in slave mode</li>
<li><bug>61270</bug>Fixed width fonts too small in text areas to read
under hidpi (user manual bug)</li>
+ <li><bug>61292</bug>Make processing of samples in reporter more
robust.</li>
</ul>
<!-- =================== Thanks =================== -->
