svn commit: r1514979 - /jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java

[se...@apache.org]

Author: sebb
Date: Sat Aug 17 11:47:15 2013
New Revision: 1514979

URL: http://svn.apache.org/r1514979
Log:
Javadoc
Improve order of checks

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1514979&r1=1514978&r2=1514979&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Sat Aug 17 11:47:15 2013
@@ -259,13 +259,15 @@ public class ConstantThroughputTimer ext
      * Override the setProperty method in order to convert
      * the original String calcMode propertty.
      * This used the locale-dependent display value, so caused
-     * problems when the language was changed. 
+     * problems when the language was changed.
+     * Note that the calcMode StringProperty is replaced with an IntegerProperty
+     * so the conversion only needs to happen once.
      */
     @Override
     public void setProperty(JMeterProperty property) {
-        final String pn = property.getName();
-        if (pn.equals("calcMode")) {
-            if (property instanceof StringProperty) {
+        if (property instanceof StringProperty) {
+            final String pn = property.getName();
+            if (pn.equals("calcMode")) {
                 final Object objectValue = property.getObjectValue();
                 try {
                     final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass());