Skip to content

Commit 4ad8e99

Browse files
committed
Merge pull request 'Properly shutdown proxies without checking access control (since that's impossible at shutdown)' (#25) from bugfix/24115 into develop
2 parents fa3a6d4 + dfd717c commit 4ad8e99

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,17 @@ public class ProxyService {
9595

9696
@PreDestroy
9797
public void shutdown() {
98-
containerKiller.shutdown();
99-
for (Proxy proxy: getProxies(null, true)) backend.stopProxy(proxy);
98+
try {
99+
containerKiller.shutdown();
100+
} finally {
101+
for (Proxy proxy : activeProxies) {
102+
try {
103+
backend.stopProxy(proxy);
104+
} catch (Exception exception) {
105+
exception.printStackTrace();
106+
}
107+
}
108+
}
100109
}
101110

102111
/**

0 commit comments

Comments
 (0)