[CXF-5610] Revert part of the commit so the WS-N tests will pass
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc643bae Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc643bae Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc643bae Branch: refs/heads/2.6.x-fixes Commit: fc643bae8e1c47940779e39abaf261e5620e355b Parents: 336b9e0 Author: Daniel Kulp <[email protected]> Authored: Mon Mar 17 10:43:05 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Mon Mar 17 11:19:30 2014 -0400 ---------------------------------------------------------------------- .../cxf/transport/http_jetty/JettyHTTPServerEngine.java | 8 ++++---- .../cxf/transport/http_jetty/JettyHTTPServerEngineTest.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/fc643bae/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java index 37f0779..071c1b2 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java @@ -36,7 +36,6 @@ import org.apache.cxf.common.util.SystemPropertyAction; import org.apache.cxf.configuration.jsse.TLSServerParameters; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.transport.HttpUriMapper; -import org.apache.cxf.transport.http.HttpUrlUtil; import org.apache.cxf.transport.https_jetty.JettySslConnectorFactory; import org.eclipse.jetty.security.SecurityHandler; import org.eclipse.jetty.server.AbstractConnector; @@ -279,16 +278,17 @@ public class JettyHTTPServerEngine protected void checkRegistedContext(URL url) { String path = url.getPath(); for (String registedPath : registedPaths) { - if (path.equals(registedPath) - || HttpUrlUtil.checkContextPath(registedPath, path)) { + if (path.equals(registedPath)) { + //|| HttpUrlUtil.checkContextPath(registedPath, path)) { // Throw the address is already used exception throw new Fault(new Message("ADD_HANDLER_CONTEXT_IS_USED_MSG", LOG, url, registedPath)); } + /* if (HttpUrlUtil.checkContextPath(path, registedPath)) { throw new Fault(new Message("ADD_HANDLER_CONTEXT_CONFILICT_MSG", LOG, url, registedPath)); } + */ } - } http://git-wip-us.apache.org/repos/asf/cxf/blob/fc643bae/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java index add1e86..4fbf1aa 100644 --- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java +++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java @@ -199,7 +199,7 @@ public class JettyHTTPServerEngineTest extends Assert { } catch (Exception ex) { assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello/test") > 0); } - + /* try { engine.addServant(new URL(urlStr + "/test"), handler2); fail("We don't support to publish the two service at the same context path"); @@ -213,6 +213,7 @@ public class JettyHTTPServerEngineTest extends Assert { } catch (Exception ex) { assertTrue("Get a wrong exception message", ex.getMessage().indexOf("hello") > 0); } + */ engine.addServant(new URL(urlStr2), handler2);
