Author: dkulp
Date: Thu Apr 10 07:55:30 2008
New Revision: 646831
URL: http://svn.apache.org/viewvc?rev=646831&view=rev
Log:
Merged revisions 646822 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r646822 | dkulp | 2008-04-10 10:37:55 -0400 (Thu, 10 Apr 2008) | 2 lines
Remove a test that was only set to run on HP-UX, but now fails on HP-UX as
the bug in Jetty that this was testing a workaround for was apparently fixed in
the latest jetty.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java?rev=646831&r1=646830&r2=646831&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Thu Apr 10 07:55:30 2008
@@ -75,66 +75,5 @@
}
}
- /**
- * On HP-UX, the server seems to close the connection by the time the
- * thread servicing the requests terminates and therefore possibly before
- * the client has had a chance to read the response (the client throws
- * a SocketException: Broken pipe). This may be a bug
- * in Jetty or in the HP-UX JDK. It can be worked around by
- * adding a sleep to the end of method handle in
- * org.apache.cxf.transport.http_jetty.JettyHTTPHandler or,
- * preferrably, by ensuring the client uses keep alive
- * connections.
- */
- @Test
- public void testDelayReadingPartialResponse() throws Exception {
- if (!"HP-UX".equals(System.getProperty("os.name"))) {
- return;
- }
-
- assertTrue(ConnectionHelper.isKeepAliveConnection(greeter));
- ConnectionHelper.setKeepAliveConnection(greeter, false);
-
- class DelayInterceptor extends AbstractPhaseInterceptor<Message> {
- long delay = 100L;
- DelayInterceptor() {
- super(Phase.RECEIVE);
- }
- public void handleMessage(Message msg) {
- try {
- Thread.sleep(delay);
- } catch (Exception ex) {
- // ignore
- } finally {
- if (delay < 1000L) {
- delay += 100L;
- }
- }
- }
- }
- DelayInterceptor interceptor = new DelayInterceptor();
- staticBus.getInInterceptors().add(interceptor);
-
- int n = 100;
- try {
- for (int i = 0; i < n; i++) {
- greeter.greetMeOneWay("delay reading partial reponse");
- }
- fail("Expected SocketException not thrown");
- } catch (Exception ex) {
- Throwable t = ex.getCause();
- while (null != t.getCause()) {
- t = t.getCause();
- }
- assertTrue("Unexpected exception type: " + t.getClass().getName(),
- t instanceof SocketException);
- } finally {
- // need to reset to Keep-Alive for subsequenct tests
- // (all tests are using the same conduit selector, and
- // thus the same conduit)
- ConnectionHelper.setKeepAliveConnection(greeter, true);
- staticBus.getInInterceptors().remove(interceptor);
- }
- }
}
