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 2014/10/12 19:08:03 UTC
svn commit: r1631216 - in
/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd:
HttpRequestImpl.java OpenEJBHttpServer.java
Author: rmannibucau
Date: Sun Oct 12 17:08:02 2014
New Revision: 1631216
URL: http://svn.apache.org/r1631216
Log:
cdi support for servlet/filter in embedded mode
Modified:
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java?rev=1631216&r1=1631215&r2=1631216&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java Sun Oct 12 17:08:02 2014
@@ -1113,7 +1113,11 @@ public class HttpRequestImpl implements
@Override
public void invalidate() {
- listener.sessionDestroyed(new HttpSessionEvent(session));
+ try {
+ listener.sessionDestroyed(new HttpSessionEvent(session));
+ } finally {
+ super.invalidate();
+ }
}
}
}
\ No newline at end of file
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java?rev=1631216&r1=1631215&r2=1631216&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java Sun Oct 12 17:08:02 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.server.httpd;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.core.ParentClassLoaderFinder;
import org.apache.openejb.loader.Options;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServiceException;
@@ -74,7 +75,7 @@ public class OpenEJBHttpServer implement
}
public OpenEJBHttpServer(final HttpListener listener) {
- this.listener = listener;
+ this.listener = new OpenEJBHttpRegistry.ClassLoaderHttpListener(listener, ParentClassLoaderFinder.Helper.get());
}
public static boolean isTextXml(final Map<String, String> headers) {