Bug 471724 - [http.servlet] TCCL is not being kept as expected during registration using the HttpService API

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml b/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
index 66671ea65..f96c37f84 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>org.eclipse.equinox.bundles</groupId>
-    <version>4.5.0-SNAPSHOT</version>
+    <version>4.6.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
index 51bfa568e..96d5988c6 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
@@ -1195,7 +1195,12 @@ public class ServletTest extends TestCase {
 			}
 
 		};
-		String expected = Thread.currentThread().getContextClassLoader().getClass().getName();
+
+		ClassLoader originalTCCL = Thread.currentThread().getContextClassLoader();
+		ClassLoader dummy = new ClassLoader() {
+		};
+		Thread.currentThread().setContextClassLoader(dummy);
+		String expected = dummy.getClass().getName();
 		String actual = null;
 		ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService();
 		try {
@@ -1205,6 +1210,7 @@ public class ServletTest extends TestCase {
 		} catch (Exception e) {
 			fail("Unexpected exception: " + e);
 		} finally {
+			Thread.currentThread().setContextClassLoader(originalTCCL);
 			try {
 				extendedHttpService.unregister("/tccl");
 				extendedHttpService.unregisterFilter(tcclFilter);