[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    tomee git commit: ensure we cleanup openejb-http eviction maps on normal end events
From:       rmannibucau () apache ! org
Date:       2014-12-28 20:13:17
Message-ID: 5b125271f5634a4582a2698ff40c50fe () git ! apache ! org
[Download RAW message or body]

Repository: tomee
Updated Branches:
  refs/heads/develop 6bdfb9d04 -> 9f7bfd4b4


ensure we cleanup openejb-http eviction maps on normal end events


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9f7bfd4b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9f7bfd4b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9f7bfd4b

Branch: refs/heads/develop
Commit: 9f7bfd4b4cad3bfd7de8246ee814bc4ed4d6ea86
Parents: 6bdfb9d
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Sun Dec 28 21:12:58 2014 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Sun Dec 28 21:12:58 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/openejb/server/httpd/HttpRequestImpl.java  | 3 ++-
 .../org/apache/openejb/server/httpd/OpenEJBAsyncContext.java   | 6 +++++-
 tck/cdi-embedded/src/test/resources/failing.xml                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/9f7bfd4b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
                
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java \
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 index 33a513e..4e31e51 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
                
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 @@ -108,7 +108,7 @@ public class HttpRequestImpl implements HttpRequest {
         if (!"true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.http.eviction", \
"true"))) {  return;
         }
-        es = Executors.newScheduledThreadPool(1, new \
DaemonThreadFactory(OpenEJBAsyncContext.class)); +        es = \
Executors.newScheduledThreadPool(1, new DaemonThreadFactory(HttpRequestImpl.class));  \
es.scheduleWithFixedDelay(new Runnable() {  @Override
             public void run() {
@@ -1230,6 +1230,7 @@ public class HttpRequestImpl implements HttpRequest {
 
         @Override
         public void invalidate() {
+            SESSIONS.remove(session.getId());
             try {
                 listener.sessionDestroyed(new HttpSessionEvent(session));
             } finally {

http://git-wip-us.apache.org/repos/asf/tomee/blob/9f7bfd4b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
                
----------------------------------------------------------------------
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java \
b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
 index bdd3b4e..f61c799 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
                
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBAsyncContext.java
 @@ -140,7 +140,11 @@ public class OpenEJBAsyncContext implements AsyncContext {
             }
         }
 
-        commit();
+        try {
+            commit();
+        } finally {
+            INITIALIZED.remove(this);
+        }
     }
 
     private void onError(final Throwable ignored) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/9f7bfd4b/tck/cdi-embedded/src/test/resources/failing.xml
                
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml \
b/tck/cdi-embedded/src/test/resources/failing.xml index e245009..afef25c 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -26,7 +26,7 @@
     -Dopenejb.deploymentId.format={appId}/{ejbJarId}/{ejbName}
     -->
     <classes>
-      <class name="org.jboss.cdi.tck.tests.context.session.async.SessionContextAsyncListenerTest" \
/> +      <class name="org.jboss.cdi.tck.tests.context.application.async.ApplicationContextAsyncListenerTest" \
/>  </classes>
   </test>
 </suite>


[prev in list] [next in list] [prev in thread] [next in thread]