Merge pull request #321 from chemicwepn/master

change deleteDirectoryTask to a List

Author: jekh

browsermob-core/src/main/java/net/lightbody/bmp/proxy/selenium/SeleniumProxyHandler.java

@@ -45,6 +45,9 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
 
 /* ------------------------------------------------------------ */
 
@@ -76,7 +79,7 @@ public class SeleniumProxyHandler extends AbstractHttpHandler {
       private final boolean proxyInjectionMode;
       private final boolean forceProxyChain;
       private boolean fakeCertsGenerated;
-      private DeleteDirectoryTask deleteDirectoryTask;
+      private final List<DeleteDirectoryTask> deleteDirectoryTasks = Collections.synchronizedList(new ArrayList<DeleteDirectoryTask>());
 
       // see docs for the lock object on SeleniumServer for information on this and why it is IMPORTANT!
       private Object shutdownLock;
@@ -609,7 +612,8 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
               final File root = tempDir.toFile();
 
               // delete the temp directory when the VM stops or aborts
-              deleteDirectoryTask = new DeleteDirectoryTask(tempDir);
+              DeleteDirectoryTask deleteDirectoryTask = new DeleteDirectoryTask(tempDir);
+              deleteDirectoryTasks.add(deleteDirectoryTask);
               Runtime.getRuntime().addShutdownHook(new Thread(deleteDirectoryTask));
 
               // copy the cybervillains cert files to the temp directory from the classpath
@@ -637,8 +641,12 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
       }
 
       public void cleanSslWithCyberVilliansCA(){
-          if(deleteDirectoryTask != null) {
-              deleteDirectoryTask.run();
+          synchronized (deleteDirectoryTasks) {
+              if (!deleteDirectoryTasks.isEmpty()) {
+                  for (DeleteDirectoryTask task : deleteDirectoryTasks) {
+                      task.run();
+                  }
+              }
           }
       }