Repository: tomee Updated Branches: refs/heads/tomee-1.7.x e85397821 -> d892d1ce0
TOMEE-1507 removing apps when undeployed from set of apps in rest service Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d892d1ce Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d892d1ce Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d892d1ce Branch: refs/heads/tomee-1.7.x Commit: d892d1ce08d4a7d6fd8e7bfce9c62837e4dfbb04 Parents: e853978 Author: Romain Manni-Bucau <[email protected]> Authored: Thu Feb 5 10:46:08 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Thu Feb 5 10:46:08 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/server/rest/RESTService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d892d1ce/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java ---------------------------------------------------------------------- diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java index 7e2e1bd..c70550f 100644 --- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java +++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java @@ -920,7 +920,8 @@ public abstract class RESTService implements ServerService, SelfManaging { public void undeploy(@Observes final AssemblerBeforeApplicationDestroyed event) { final AppInfo app = event.getApp(); - if (deployedApplications.contains(app)) { + final boolean removed = deployedApplications.remove(app); + if (removed) { for (final WebAppInfo webApp : app.webApps) { final List<DeployedService> toRemove = new ArrayList<DeployedService>(); for (final DeployedService service : services) {
