You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/20 17:16:40 UTC
tomee git commit: for deployerEjb case we need to force stop before
calling destroy since lifecycle can be reversed (this bean shouldnt exist for
war :()
Repository: tomee
Updated Branches:
refs/heads/master d2f036580 -> 0b62bd102
for deployerEjb case we need to force stop before calling destroy since lifecycle can be reversed (this bean shouldnt exist for war :()
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0b62bd10
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0b62bd10
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0b62bd10
Branch: refs/heads/master
Commit: 0b62bd102087a87f1886748039ec0f40ceb53bef
Parents: d2f0365
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 20 17:16:26 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 20 17:16:26 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/LazyStopStandardRoot.java | 3 +++
.../org/apache/tomee/catalina/TomEEWebappClassLoader.java | 8 ++++++++
.../java/org/apache/tomee/embedded/TomEEUndeployTest.java | 1 +
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0b62bd10/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
index 040fed2..ef77770 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopStandardRoot.java
@@ -321,6 +321,9 @@ public class LazyStopStandardRoot implements WebResourceRoot, JmxEnabled {
}
public void internalDestroy() throws LifecycleException {
+ if (LifecycleState.STARTED == delegate.getState()) {
+ internalStop();
+ }
delegate.destroy();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0b62bd10/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
index 0c94a64..1b1bf4b 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
@@ -18,6 +18,7 @@ package org.apache.tomee.catalina;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.WebResourceSet;
@@ -255,6 +256,13 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader {
public void internalDestroy() {
try {
+ if (!stopped) {
+ try {
+ internalStop();
+ } catch (final LifecycleException e) {
+ // no-op
+ }
+ }
super.destroy();
} finally {
cleanUpClassLoader();
http://git-wip-us.apache.org/repos/asf/tomee/blob/0b62bd10/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
index 72516cf..8709f1b 100644
--- a/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
+++ b/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/TomEEUndeployTest.java
@@ -109,6 +109,7 @@ public class TomEEUndeployTest {
private static void createWebapp(final File app) throws IOException {
Files.mkdirs(app);
IO.copy(new ByteArrayInputStream("test".getBytes()), new File(app, "index.html"));
+ Files.mkdirs(new File(app, "WEB-INF"));
assertTrue(app.exists());
}