Repository: tomee
Updated Branches:
refs/heads/master a37132fee -> dc2b7374e
TOMEE-1855 limiting jsp/tag leaks
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dc2b7374
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dc2b7374
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dc2b7374
Branch: refs/heads/master
Commit: dc2b7374e50190c29f1235ecd0ec0925de24768b
Parents: a37132f
Author: Romain manni-Bucau
Authored: Fri Jul 1 18:42:01 2016 +0200
Committer: Romain manni-Bucau
Committed: Fri Jul 1 18:42:01 2016 +0200
--
.../staticresources/AvoidConflictTest.java | 2 +
.../org/apache/openejb/core/WebContext.java | 45 +---
.../server/httpd/BeginWebBeansListener.java | 5 +
.../tomee/catalina/JavaeeInstanceManager.java | 102 +++
.../apache/tomee/embedded/FailingJspTest.java | 76 ++
.../test/resources/META-INF/resources/fail.jsp | 30 ++
6 files changed, 207 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc2b7374/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
--
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
index 111bf6b..0c93110 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/staticresources/AvoidConflictTest.java
@@ -22,6 +22,7 @@ import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
@@ -38,6 +39,7 @@ public class AvoidConflictTest {
public static Archive war() {
return ShrinkWrap.create(WebArchive.class, "AvoidConflictTest.war")
.addClasses(TheResource.class, SimpleServlet.class,
PreviousFilter.class)
+.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsWebResource(new StringAsset("static"), "index.html")
.addAsWebResource(new StringAsset("JSP <%= 5 %>"),
"sample.jsp");
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/dc2b7374/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
--
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
b/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
index 073be91..0e090c0 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
@@ -22,6 +22,8 @@ import org.apache.openejb.Injection;
import org.apache.openejb.InjectionProcessor;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.cdi.ConstructorInjectionBean;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.config.WebBeansContext;
@@ -44,6 +46,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
public class WebContext {
private String id;
@@ -52,7 +55,7 @@ public class WebContext {
private Context jndiEnc;
private final AppContext appContext;
private Map bindings;
-private final Map creationalContexts = new
ConcurrentHashMap<>();
+private final ConcurrentMap
creationalContexts = new ConcurrentHashMap<>();
private WebBeansContext webbeansContext;
private String contextRoot;
private String host;
@@ -149,24 +152,28 @@ public class WebContext {
final Context unwrap = InjectionProcessor.unwrap(getInitialContext());
final InjectionProcessor injectionProcessor = new