JETTY-1155 HttpConnection.close notifies HttpExchange

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1163 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -7,6 +7,7 @@ jetty-7.0.2-SNAPSHOT
  + 298144 Unit test for jetty-client connecting to a server that uses Basic Auth
  + 298145 Reorganized test harness to separate the HTTP PUT and HTTP GET test URLs
  + JETTY-910 Allow request listeners to access session
+ + JETTY-1155 HttpConnection.close notifies HttpExchange
  + JETTY-1156 SSL blocking close with JVM Bug busy key fix
  + JETTY-1157 Don't hold array passed in write(byte[])
  + COMETD-46 reset ContentExchange response content on resend

jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java

@@ -359,7 +359,9 @@ public class HttpConnection implements Connection
         finally
         {
             if (_exchange != null && _exchange.isAssociated())
+            {
                 _exchange.disassociate();
+            }
         }
     }
 
@@ -547,7 +549,20 @@ public class HttpConnection implements Connection
 
     public void close() throws IOException
     {
-        _endp.close();
+        try
+        {
+            _endp.close();
+        }
+        finally
+        {
+            HttpExchange exchange=_exchange;
+            if (exchange!=null)
+            {
+                int status = exchange.getStatus();
+                if (status>HttpExchange.STATUS_START && status<HttpExchange.STATUS_COMPLETED)
+                    System.err.println("\nCLOSE "+exchange);
+            }
+        }
     }
 
     public void setIdleTimeout(long expire)
@@ -620,5 +635,4 @@ public class HttpConnection implements Connection
             }
         }
     }
-
 }

jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpExchangeCancelTest.java

@@ -291,7 +291,6 @@ public abstract class AbstractHttpExchangeCancelTest extends TestCase
     {
         try
         {
-            System.err.println("doing it");
             TestHttpExchange exchange = new TestHttpExchange();
             exchange.setAddress(newAddress());
             exchange.setURI("/?action=throw");
@@ -306,7 +305,6 @@ public abstract class AbstractHttpExchangeCancelTest extends TestCase
         }
         finally
         {
-            System.err.println("OVER");
         }
     }
 

jetty-client/src/test/java/org/eclipse/jetty/client/ContentExchangeTest.java

@@ -101,8 +101,6 @@ public class ContentExchangeTest
     
     public void testPut() throws Exception
     {
-        System.err.println(getName());
-        
         startClient(_realm);
     
         ContentExchange putExchange = new ContentExchange();
@@ -126,8 +124,6 @@ public class ContentExchangeTest
     
     public void testGet() throws Exception
     {
-        System.err.println(getName());
-        
         startClient(_realm);
     
         ContentExchange getExchange = new ContentExchange();
@@ -152,8 +148,6 @@ public class ContentExchangeTest
     
     public void testHead() throws Exception
     {
-        System.err.println(getName());
-        
         startClient(_realm);
     
         ContentExchange getExchange = new ContentExchange();

jetty-client/src/test/java/org/eclipse/jetty/client/HttpGetRedirectTest.java

@@ -91,8 +91,6 @@ public class HttpGetRedirectTest
 
     public void testGet() throws Exception
     {
-        System.err.println(getName());
-
         startClient(_realm);
 
         ContentExchange getExchange = new ContentExchange();