jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1647367 - in /jmeter/trunk: src/core/org/apache/jmeter/save/converters/ xdocs/
Date Mon, 22 Dec 2014 18:33:59 GMT
Author: fschumacher
Date: Mon Dec 22 18:33:59 2014
New Revision: 1647367

URL: http://svn.apache.org/r1647367
Log:
Bug 57389: Fix potential NPE in org.apache.jmeter.save.converters
Bugzilla Id: 57389

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
    jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class BooleanPropertyConverter im
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) {// superclass does
not use types
-        return arg0.equals(BooleanProperty.class);
+        return BooleanProperty.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class IntegerPropertyConverter im
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does
not use types
-        return arg0.equals(IntegerProperty.class);
+        return IntegerProperty.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java Mon
Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class LongPropertyConverter imple
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does
not use types
-        return arg0.equals(LongProperty.class);
+        return LongProperty.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java Mon
Dec 22 18:33:59 2014
@@ -46,7 +46,7 @@ public class MultiPropertyConverter exte
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does
not use types
-        return arg0.equals(CollectionProperty.class) || arg0.equals(MapProperty.class);
+        return CollectionProperty.class.equals(arg0) || MapProperty.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Mon Dec 22 18:33:59 2014
@@ -113,7 +113,7 @@ public class SampleSaveConfigurationConv
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) {
-        return arg0.equals(SampleSaveConfiguration.class);
+        return SampleSaveConfiguration.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -53,7 +53,7 @@ public class TestElementPropertyConverte
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does
not use types
-        return arg0.equals(TestElementProperty.class);
+        return TestElementProperty.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
Mon Dec 22 18:33:59 2014
@@ -60,7 +60,7 @@ public class TestResultWrapperConverter
     /** {@inheritDoc} */
     @Override
     public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { // superclass does
not use types
-        return arg0.equals(TestResultWrapper.class);
+        return TestResultWrapper.class.equals(arg0);
     }
 
     /** {@inheritDoc} */

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1647367&r1=1647366&r2=1647367&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Dec 22 18:33:59 2014
@@ -219,6 +219,7 @@ See  <bugzilla>56357</bugzilla> for deta
 <li>Updated to jsoup-1.8.1.jar (from 1.7.3)</li>
 <li><bug>57276</bug>RMIC no longer needed since Java 5</li>
 <li><bug>57310</bug>Replace System.getProperty("file.separator") with File.separator
throughout (Also "path.separator" with File.pathSeparator)</li>
+<li><bug>57389</bug>Fix potential NPE in converters</li>
 </ul>
 
 <ch_section>Thanks</ch_section>



Mime
View raw message