You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/06 18:59:15 UTC
[1/2] tomee git commit: TOMEE-1576 remove now superfluous filtering
Repository: tomee
Updated Branches:
refs/heads/fb_tomee2_owb16 85043a4b1 -> 7620e2f31
TOMEE-1576 remove now superfluous filtering
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6ac3f0bf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6ac3f0bf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6ac3f0bf
Branch: refs/heads/fb_tomee2_owb16
Commit: 6ac3f0bf6c452a89702956f6691c1a6bf4bc6272
Parents: 85043a4
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 6 18:57:01 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 6 18:57:01 2015 +0200
----------------------------------------------------------------------
.../apache/openejb/server/httpd/HttpRequestImpl.java | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6ac3f0bf/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 65d8817..3ce5c37 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
@@ -907,20 +907,7 @@ public class HttpRequestImpl implements HttpRequest {
session = previous.session;
}
}
-
- if (session != null) {
- return new ServletSessionAdapter(session) {
- @Override
- public void invalidate() {
- super.invalidate();
-
- // after invalidating the session we need to remove the reference to the cached Session
- HttpRequestImpl.this.session = null;
- }
- };
- }
-
- return null;
+ return session;
}
protected URI getSocketURI() {
[2/2] tomee git commit: TOMEE-1572 start up with dummy session and
other contexts started.
Posted by st...@apache.org.
TOMEE-1572 start up with dummy session and other contexts started.
This is needed as I did remove synthentic session support in OWB.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7620e2f3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7620e2f3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7620e2f3
Branch: refs/heads/fb_tomee2_owb16
Commit: 7620e2f31040a0d94259c2555779c0290b521328
Parents: 6ac3f0b
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 6 18:57:58 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 6 18:57:58 2015 +0200
----------------------------------------------------------------------
tck/cdi-embedded/src/test/resources/arquillian.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7620e2f3/tck/cdi-embedded/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/arquillian.xml b/tck/cdi-embedded/src/test/resources/arquillian.xml
index 5047d58..e3d314b 100644
--- a/tck/cdi-embedded/src/test/resources/arquillian.xml
+++ b/tck/cdi-embedded/src/test/resources/arquillian.xml
@@ -34,6 +34,7 @@
queue = new://Resource?type=Queue
topic = new://Resource?type=Topic
</property>
+ <property name="startDefaultScopes">true</property>
</configuration>
</container>
</arquillian>