You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/12/14 18:35:59 UTC
svn commit: r604240 - in /incubator/cxf/branches/2.0.x-fixes: ./
tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Author: dkulp
Date: Fri Dec 14 09:35:58 2007
New Revision: 604240
URL: http://svn.apache.org/viewvc?rev=604240&view=rev
Log:
Merged revisions 604113 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r604113 | ema | 2007-12-14 01:37:34 -0500 (Fri, 14 Dec 2007) | 1 line
To fix the Jetty throws InterruptedException sometimes
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=604240&r1=604239&r2=604240&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Fri Dec 14 09:35:58 2007
@@ -450,6 +450,7 @@
@Test
public void testHelloWorldExternalBindingFile() throws Exception {
Server server = new Server(8585);
+
ResourceHandler reshandler = new ResourceHandler();
reshandler.setResourceBase(getLocation("/wsdl2java_wsdl/"));
server.addHandler(reshandler);
@@ -458,7 +459,12 @@
env.put(ToolConstants.CFG_BINDING, "http://localhost:8585/remote-hello_world_binding.xsd");
processor.setContext(env);
processor.execute();
- server.stop();
+ try {
+ reshandler.stop();
+ } finally {
+ server.stop();
+ server.destroy();
+ }
}