You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/25 04:06:13 UTC
svn commit: r532166 - in /incubator/tuscany/java/sca/modules/http-tomcat/src:
main/java/org/apache/tuscany/http/tomcat/TomcatServer.java
test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java
Author: jsdelfino
Date: Tue Apr 24 19:06:13 2007
New Revision: 532166
URL: http://svn.apache.org/viewvc?view=rev&rev=532166
Log:
Switched to use the Http11NioProtocol as it seems to fix the connection and port cleanup issues we've been running into with Tomcat. The default Http11Protocol is deprecated anyway.
Modified:
incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/TomcatServer.java
incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/TomcatServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/TomcatServer.java?view=diff&rev=532166&r1=532165&r2=532166
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/TomcatServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/http/tomcat/TomcatServer.java Tue Apr 24 19:06:13 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.http.tomcat;
-import java.net.InetAddress;
-
import javax.servlet.Servlet;
import org.apache.catalina.Context;
@@ -84,7 +82,12 @@
// Install a default HTTP connector
if (connector == null) {
//TODO support multiple connectors on different ports
- connector = tomcat.createConnector((InetAddress)null, port, false);
+ try {
+ connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+ connector.setPort(port);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
tomcat.addConnector(connector);
}
Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java?view=diff&rev=532166&r1=532165&r2=532166
==============================================================================
--- incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/http/tomcat/TomcatServerTestCase.java Tue Apr 24 19:06:13 2007
@@ -102,8 +102,6 @@
service.destroy();
}
- // FIXME this test randomly breaks on Linux, probably something
- // to do with cleaning up TCP/IP connections?
public void testNoMappings() throws Exception {
TomcatServer service = new TomcatServer();
service.init();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org