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 2016/12/21 16:50:20 UTC

svn commit: r1775501 - /jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

Author: pmouawad
Date: Wed Dec 21 16:50:20 2016
New Revision: 1775501

URL: http://svn.apache.org/viewvc?rev=1775501&view=rev
Log:
Sonar : Fix code smells

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=1775501&r1=1775500&r2=1775501&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java Wed Dec 21 16:50:20 2016
@@ -26,7 +26,6 @@ import org.apache.jmeter.engine.event.Lo
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.processor.PreProcessor;
 import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.testelement.property.CollectionProperty;
 import org.apache.jmeter.testelement.property.PropertyIterator;
@@ -192,12 +191,4 @@ public class UserParameters extends Abst
         up.lock = lock; // ensure that clones share the same lock object
         return up;
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void mergeIn(TestElement element) {
-        // super.mergeIn(element);
-    }
 }