svn commit: r652187 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java

[sebb]

Author: sebb
Date: Tue Apr 29 16:27:24 2008
New Revision: 652187

URL: http://svn.apache.org/viewvc?rev=652187&view=rev
Log:
Ensure all counter access is synch

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java?rev=652187&r1=652186&r2=652187&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultSaver.java 
Tue Apr 29 16:27:24 2008
@@ -45,6 +45,7 @@
        private static final Logger log = LoggingManager.getLoggerForClass();
 
        // File name sequence number
+       //@GuardedBy("this")
        private static long sequenceNumber = 0;
 
        public static final String FILENAME = "FileSaver.filename"; // 
$NON-NLS-1$
@@ -53,7 +54,7 @@
 
     public static final String SUCCESS_ONLY = "FileSaver.successonly"; // 
$NON-NLS-1$
 
-    private static synchronized long nextNumber() {
+    private synchronized long nextNumber() {
                return ++sequenceNumber;
        }
 
@@ -89,7 +90,9 @@
                // System.out.println("-- "+me+this.getName()+"
                // "+Thread.currentThread().getName());
                super.clear();
-               sequenceNumber = 0; // TODO is this the right thing to do?
+               synchronized(this){
+                   sequenceNumber = 0; // TODO is this the right thing to do?
+               }
        }
 
        // TODO - is this the same as the above?
@@ -134,7 +137,6 @@
                    }
                }
 
-               nextNumber();
                String fileName = makeFileName(s.getContentType());
                log.debug("Saving " + s.getSampleLabel() + " in " + fileName);
         s.setResultFileName(fileName);// Associate sample with file name
@@ -170,7 +172,7 @@
                                }
                        }
                }
-               return getFilename() + sequenceNumber + "." + suffix;
+               return getFilename() + nextNumber() + "." + suffix;
        }
 
        /*



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]