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 2011/10/06 18:17:02 UTC
svn commit: r1179689 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Author: rmannibucau
Date: Thu Oct 6 16:17:01 2011
New Revision: 1179689
URL: http://svn.apache.org/viewvc?rev=1179689&view=rev
Log:
OPENEJB-1694 OpenEJBLifecycle.startApplication can receive something else than a StartupObject
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1179689&r1=1179688&r2=1179689&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Thu Oct 6 16:17:01 2011
@@ -153,6 +153,14 @@ public class OpenEJBLifecycle implements
@Override
public void startApplication(Object startupObject)
{
+ if (startupObject instanceof ServletContextEvent) {
+ startServletContext((ServletContext) getServletContext(startupObject)); // TODO: check it is relevant
+ return;
+ } else if (!(startupObject instanceof StartupObject)) {
+ // ignored
+ return;
+ }
+
StartupObject stuff = (StartupObject) startupObject;
// Initalize Application Context
logger.info(OWBLogConst.INFO_0005);
@@ -522,7 +530,7 @@ public class OpenEJBLifecycle implements
JspApplicationContext applicationCtx = factory.getJspApplicationContext(servletContext);
applicationCtx.addELResolver(resolver);
} else {
- logger.debug("Default JSPFactroy instance has not found");
+ logger.debug("Default JSPFactory instance has not found");
}
}