svn commit: r1788978 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java

[sebb]

Author: sebb
Date: Mon Mar 27 16:26:15 2017
New Revision: 1788978

URL: http://svn.apache.org/viewvc?rev=1788978&view=rev
Log:
Rename private field threadSafeLenientFormatter to avoid confusion with public 
method with the same name

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=1788978&r1=1788977&r2=1788978&view=diff
==============================================================================
--- 
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java 
(original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java 
Mon Mar 27 16:26:15 2017
@@ -485,7 +485,7 @@ public class SampleSaveConfiguration imp
      * Also, there's currently no way to change the value via the GUI, so 
changing it
      * later means editting the JMX, or recreating the Listener.
      */
-    private transient FastDateFormat threadSafeLenientFormatter =
+    private transient FastDateFormat timestampFormatter =
         dateFormat != null ? FastDateFormat.getInstance(dateFormat) : null;
     
     // Don't save this, as not settable via GUI
@@ -601,9 +601,9 @@ public class SampleSaveConfiguration imp
     private void setupDateFormat(String pDateFormat) {
         this.dateFormat = pDateFormat;
         if(dateFormat != null) {
-            this.threadSafeLenientFormatter = 
FastDateFormat.getInstance(dateFormat);
+            this.timestampFormatter = FastDateFormat.getInstance(dateFormat);
         } else {
-            this.threadSafeLenientFormatter = null;
+            this.timestampFormatter = null;
         }
     }
 
@@ -612,7 +612,7 @@ public class SampleSaveConfiguration imp
         try {
             SampleSaveConfiguration clone = 
(SampleSaveConfiguration)super.clone();
             if(this.dateFormat != null) {
-                clone.threadSafeLenientFormatter = 
(FastDateFormat)this.threadSafeLenientFormatter().clone();
+                clone.timestampFormatter = 
(FastDateFormat)this.threadSafeLenientFormatter().clone();
             }
             return clone;
         }
@@ -971,11 +971,11 @@ public class SampleSaveConfiguration imp
     public FastDateFormat threadSafeLenientFormatter() {
         // When restored by XStream threadSafeLenientFormatter may not have 
         // been initialized
-        if(threadSafeLenientFormatter == null) {
-            threadSafeLenientFormatter = 
+        if(timestampFormatter == null) {
+            timestampFormatter = 
                     dateFormat != null ? 
FastDateFormat.getInstance(dateFormat) : null;
         }
-        return threadSafeLenientFormatter;
+        return timestampFormatter;
     }
 
     public int assertionsResultsToSave() {