jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1767378 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Date Mon, 31 Oct 2016 21:44:09 GMT
Author: pmouawad
Date: Mon Oct 31 21:44:09 2016
New Revision: 1767378

URL: http://svn.apache.org/viewvc?rev=1767378&view=rev
Log:
Reduce code

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=1767378&r1=1767377&r2=1767378&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java Mon Oct
31 21:44:09 2016
@@ -27,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 import org.apache.commons.lang3.CharUtils;
@@ -597,11 +598,11 @@ public class SampleSaveConfiguration imp
 
         boolean stringValues = false;
         if(primitiveValues) {
-            stringValues = s.delimiter == delimiter || (delimiter != null && delimiter.equals(s.delimiter));
+            stringValues = Objects.equals(delimiter, s.delimiter);
         }
         boolean complexValues = false;
         if(primitiveValues && stringValues) {
-            complexValues = s.formatter == formatter || (formatter != null && formatter.equals(s.formatter));
+            complexValues = Objects.equals(formatter, s.formatter);
         }
 
         return primitiveValues && stringValues && complexValues;



Mime
View raw message