You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/17 23:50:04 UTC
svn commit: r1783484 -
/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Author: pmouawad
Date: Fri Feb 17 23:50:04 2017
New Revision: 1783484
URL: http://svn.apache.org/viewvc?rev=1783484&view=rev
Log:
Fix NPE sonar
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1783484&r1=1783483&r2=1783484&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Fri Feb 17 23:50:04 2017
@@ -540,7 +540,11 @@ public class JMeterUtils implements Unit
*/
public static String getParsedLabel(String key) {
String value = JMeterUtils.getResString(key);
- return value.replaceFirst("(?m)\\s*?:\\s*$", ""); // $NON-NLS-1$ $NON-NLS-2$
+ if(value != null) {
+ return value.replaceFirst("(?m)\\s*?:\\s*$", ""); // $NON-NLS-1$ $NON-NLS-2$
+ } else {
+ return null;
+ }
}
/**