Skip to content

Commit 849579a

Browse files
author
Josh
committed
change deleteDirectoryTask to a List
1 parent 8e32367 commit 849579a

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@
4040
import java.net.UnknownHostException;
4141
import java.nio.file.Files;
4242
import java.nio.file.Path;
43-
import java.util.Enumeration;
44-
import java.util.HashSet;
45-
import java.util.LinkedHashMap;
46-
import java.util.Map;
47-
import java.util.Set;
43+
import java.util.*;
4844

4945
/* ------------------------------------------------------------ */
5046

@@ -76,7 +72,7 @@ public class SeleniumProxyHandler extends AbstractHttpHandler {
7672
private final boolean proxyInjectionMode;
7773
private final boolean forceProxyChain;
7874
private boolean fakeCertsGenerated;
79-
private DeleteDirectoryTask deleteDirectoryTask;
75+
private List<DeleteDirectoryTask> deleteDirectoryTasks = new ArrayList<DeleteDirectoryTask>();
8076

8177
// see docs for the lock object on SeleniumServer for information on this and why it is IMPORTANT!
8278
private Object shutdownLock;
@@ -609,7 +605,8 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
609605
final File root = tempDir.toFile();
610606

611607
// delete the temp directory when the VM stops or aborts
612-
deleteDirectoryTask = new DeleteDirectoryTask(tempDir);
608+
DeleteDirectoryTask deleteDirectoryTask = new DeleteDirectoryTask(tempDir);
609+
deleteDirectoryTasks.add(deleteDirectoryTask);
613610
Runtime.getRuntime().addShutdownHook(new Thread(deleteDirectoryTask));
614611

615612
// copy the cybervillains cert files to the temp directory from the classpath
@@ -637,8 +634,10 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
637634
}
638635

639636
public void cleanSslWithCyberVilliansCA(){
640-
if(deleteDirectoryTask != null) {
641-
deleteDirectoryTask.run();
637+
if(!deleteDirectoryTasks.isEmpty()) {
638+
for(DeleteDirectoryTask task : deleteDirectoryTasks) {
639+
task.run();
640+
}
642641
}
643642
}
644643

0 commit comments

Comments
 (0)