From 7fcf968406b9a42c555954f2b09564e08a1f8b0e Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 21 Apr 2010 12:23:55 +0000 Subject: [PATCH] debug git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1542 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../src/main/java/org/eclipse/jetty/client/HttpExchange.java | 1 + .../eclipse/jetty/client/BlockingHttpExchangeCancelTest.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java index 36e9c8ea23b..37248d38a79 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java @@ -827,6 +827,7 @@ public class HttpExchange ex.getCause() instanceof SocketTimeoutException) { Log.debug(ex); + setStatus(HttpExchange.STATUS_EXPIRED); HttpExchange.this.onExpire(); } else diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/BlockingHttpExchangeCancelTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/BlockingHttpExchangeCancelTest.java index 70cdb74df8a..1a685fd1020 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/BlockingHttpExchangeCancelTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/BlockingHttpExchangeCancelTest.java @@ -54,17 +54,13 @@ public class BlockingHttpExchangeCancelTest extends AbstractHttpExchangeCancelTe { boolean enabled=Log.getLog().isDebugEnabled(); Log.getLog().setDebugEnabled(true); - boolean ok=false; try { super.testHttpExchangeOnExpire(); - ok=true; } finally { Log.getLog().setDebugEnabled(enabled); - if (!ok) - System.exit(1); } }