svn commit: r908166 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java

Author: sebb
Date: Tue Feb  9 19:24:33 2010
New Revision: 908166

URL: http://svn.apache.org/viewvc?rev=908166&view=rev
Log:
Thread-safety

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=908166&r1=908165&r2=908166&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java Tue Feb  9 19:24:33 2010
@@ -59,10 +59,10 @@
 
     private static final String DEFAULT_BASE = JMeterUtils.getProperty("user.dir");
 
+    //@GuardedBy("this")
     private File base;
 
-    //TODO - make "files" and "random" static as the class is a singleton?
-
+    //@GuardedBy("this")
     private final Map<String, FileEntry> files = new HashMap<String, FileEntry>();
 
     private static final FileServer server = new FileServer();
@@ -254,7 +254,7 @@
         return new BufferedWriter(osw);
     }
 
-    public void closeFiles() throws IOException {
+    public synchronized void closeFiles() throws IOException {
         Iterator<Map.Entry<String, FileEntry>>  iter = files.entrySet().iterator();
         while (iter.hasNext()) {
             Map.Entry<String, FileEntry> me = iter.next();
@@ -286,7 +286,7 @@
         }
     }
 
-    protected boolean filesOpen() {
+    boolean filesOpen() { // package access for test code only
         Iterator<FileEntry> iter = files.values().iterator();
         while (iter.hasNext()) {
             FileEntry fileEntry = iter.next();