You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/07/23 17:34:03 UTC

svn commit: r1802734 - in /jmeter/trunk: src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java

Author: fschumacher
Date: Sun Jul 23 17:34:03 2017
New Revision: 1802734

URL: http://svn.apache.org/viewvc?rev=1802734&view=rev
Log:
Make checkstyle happy and remove one lonely semicolon

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
    jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java?rev=1802734&r1=1802733&r2=1802734&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/UnmodifiableJMeterVariables.java Sun Jul 23 17:34:03 2017
@@ -95,18 +95,23 @@ class UnmodifiableJMeterVariables extend
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         UnmodifiableJMeterVariables other = (UnmodifiableJMeterVariables) obj;
         if (variables == null) {
-            if (other.variables != null)
+            if (other.variables != null) {
                 return false;
-        } else if (!variables.equals(other.variables))
+            }
+        } else if (!variables.equals(other.variables)) {
             return false;
+        }
         return true;
     }
  

Modified: jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java?rev=1802734&r1=1802733&r2=1802734&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/threads/TestUnmodifiableJMeterVariables.java Sun Jul 23 17:34:03 2017
@@ -78,7 +78,6 @@ public class TestUnmodifiableJMeterVaria
     @Test(expected = UnsupportedOperationException.class)
     public void testPutAllMapOfStringQ() {
         unmodifiables.putAll(Collections.emptyMap());
-        ;
     }
 
     @Test(expected = UnsupportedOperationException.class)