|
40 | 40 | import java.net.UnknownHostException;
|
41 | 41 | import java.nio.file.Files;
|
42 | 42 | 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.*; |
48 | 44 |
|
49 | 45 | /* ------------------------------------------------------------ */
|
50 | 46 |
|
@@ -76,7 +72,7 @@ public class SeleniumProxyHandler extends AbstractHttpHandler {
|
76 | 72 | private final boolean proxyInjectionMode;
|
77 | 73 | private final boolean forceProxyChain;
|
78 | 74 | private boolean fakeCertsGenerated;
|
79 |
| - private DeleteDirectoryTask deleteDirectoryTask; |
| 75 | + private List<DeleteDirectoryTask> deleteDirectoryTasks = new ArrayList<DeleteDirectoryTask>(); |
80 | 76 |
|
81 | 77 | // see docs for the lock object on SeleniumServer for information on this and why it is IMPORTANT!
|
82 | 78 | private Object shutdownLock;
|
@@ -609,7 +605,8 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
|
609 | 605 | final File root = tempDir.toFile();
|
610 | 606 |
|
611 | 607 | // 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); |
613 | 610 | Runtime.getRuntime().addShutdownHook(new Thread(deleteDirectoryTask));
|
614 | 611 |
|
615 | 612 | // copy the cybervillains cert files to the temp directory from the classpath
|
@@ -637,8 +634,10 @@ protected void wireUpSslWithCyberVilliansCA(String host, SslRelay listener) {
|
637 | 634 | }
|
638 | 635 |
|
639 | 636 | public void cleanSslWithCyberVilliansCA(){
|
640 |
| - if(deleteDirectoryTask != null) { |
641 |
| - deleteDirectoryTask.run(); |
| 637 | + if(!deleteDirectoryTasks.isEmpty()) { |
| 638 | + for(DeleteDirectoryTask task : deleteDirectoryTasks) { |
| 639 | + task.run(); |
| 640 | + } |
642 | 641 | }
|
643 | 642 | }
|
644 | 643 |
|
|
0 commit comments