Author: rmannibucau
Date: Tue Aug 7 09:48:25 2012
New Revision: 1370155
URL: http://svn.apache.org/viewvc?rev=1370155&view=rev
Log:
minor refactoring top be explicit on what we try to guess (reloading) and small
hack to clean openjpa cache even in tomee
Added:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1370155&r1=1370154&r2=1370155&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
Tue Aug 7 09:48:25 2012
@@ -44,15 +44,11 @@ public class LazyStopWebappClassLoader e
public void stop() throws LifecycleException {
// in our destroyapplication method we need a valid classloader to
TomcatWebAppBuilder.afterStop()
// exception: restarting we really stop it for the moment
- if (restarting || isPaused()) {
+ if (restarting || TomcatContextUtil.isReloading(relatedContext)) {
internalStop();
}
}
- private boolean isPaused() {
- return relatedContext != null && relatedContext.getPaused();
- }
-
public void internalStop() throws LifecycleException {
if (isStarted()) {
super.stop();
Added:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java?rev=1370155&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java
(added)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatContextUtil.java
Tue Aug 7 09:48:25 2012
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.catalina;
+
+import org.apache.catalina.Context;
+
+public final class TomcatContextUtil {
+ private TomcatContextUtil() {
+ // no-op
+ }
+
+ //
+ public static boolean isReloading(final Context context) {
+ return context != null && context.getPaused();
+ }
+}
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1370155&r1=1370154&r2=1370155&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Tue Aug 7 09:48:25 2012
@@ -52,6 +52,7 @@ import org.apache.naming.ContextAccessCo
import org.apache.naming.ContextBindings;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.ClassLoaderUtil;
import org.apache.openejb.Injection;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.AppInfo;
@@ -910,7 +911,7 @@ public class TomcatWebAppBuilder impleme
final Container child = host.findChild(standardContext.getName());
// skip undeployment if redeploying (StandardContext.redeploy())
- if (child instanceof org.apache.catalina.Context &&
((org.apache.catalina.Context) child).getPaused()) {
+ if (child instanceof org.apache.catalina.Context &&
TomcatContextUtil.isReloading((org.apache.catalina.Context) child)) {
return true;
}
@@ -1208,6 +1209,7 @@ public class TomcatWebAppBuilder impleme
} catch (LifecycleException e) {
logger.error("error stopping classloader of webapp " +
standardContext.getName(), e);
}
+ ClassLoaderUtil.cleanOpenJPACache(old);
}
removeContextInfo(standardContext);
}
