[jbossws-commits] JBossWS SVN: r15754 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus and 1 other directory.
Author: ropalka
Date: 2012-02-27 07:39:55 -0500 (Mon, 27 Feb 2012)
New Revision: 15754
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3444] properly teardown initial context to cleanup caches
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-27
12:36:04 UTC (rev 15753)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-27
12:39:55 UTC (rev 15754)
@@ -45,10 +45,11 @@
public void testSingleDeploy() throws Exception
{
deploy("jaxws-cxf-bus-ejb3-client.jar");
+ InitialContext iniCtx = null;
try
{
String host = getServerHost();
- InitialContext iniCtx = getInitialContext();
+ iniCtx = getServerInitialContext();
Object obj =
iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" +
EJB3ClientRemoteInterface.class.getName());
EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj;
ejb3Remote.testBusCreation();
@@ -60,6 +61,10 @@
}
finally
{
+ if (iniCtx != null)
+ {
+ iniCtx.close();
+ }
undeploy("jaxws-cxf-bus-ejb3-client.jar");
}
}
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-27 12:36:04 UTC (rev 15753)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-27 12:39:55 UTC (rev 15754)
@@ -1331,9 +1331,6 @@
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on
AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
- <!-- # [JBWS-3444] WebServiceRefClientTestCase causes Hudson job to
hang -->
-
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
-
<!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
</excludes>