318105 backed out recent changes

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

VERSION.txt

@@ -1,6 +1,5 @@
 jetty-7.3.1-SNAPSHOT
  + 316382 Support a more strict SSL option with certificates
- + 318105 Consistent return of null from continuation.getServletResponse
  + 333481 Handle UCS-4 codepoints in decode and encode
  + 335329 Moved blocking timeout handling to outside try catch
  + 336668 policy supports cert validation

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

@@ -1,5 +1,6 @@
 package org.eclipse.jetty.client;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.concurrent.CountDownLatch;
@@ -26,6 +27,7 @@ import org.junit.After;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 public class ProxyTunnellingTest
@@ -39,9 +41,9 @@ public class ProxyTunnellingTest
     {
         SslSelectChannelConnector connector = new SslSelectChannelConnector();
         String keyStorePath = MavenTestingUtils.getTestResourceFile("keystore").getAbsolutePath();
-        connector.getSslContextFactory().setKeyStore(keyStorePath);
-        connector.getSslContextFactory().setKeyStorePassword("storepwd");
-        connector.getSslContextFactory().setKeyManagerPassword("keypwd");
+        connector.setKeystore(keyStorePath);
+        connector.setPassword("storepwd");
+        connector.setKeyPassword("keypwd");
         startServer(connector, handler);
     }
 

jetty-continuation/src/main/java/org/eclipse/jetty/continuation/FauxContinuation.java

@@ -259,6 +259,7 @@ class FauxContinuation implements FilteredContinuation
      */
     public boolean enter(ServletResponse response)
     {
+        _response=response;
         return true;
     }
 

jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java

@@ -791,14 +791,13 @@ public class AsyncContinuation implements AsyncContext, Continuation
 
     /* ------------------------------------------------------------ */
     /**
-     * Unlike {@link #getResponse()}, this will return null if {@link #suspend(ServletResponse)} was not called.
      * @see org.eclipse.jetty.continuation.Continuation#getServletResponse()
      */
     public ServletResponse getServletResponse()
     {
         if (_responseWrapped && _event!=null && _event.getResponse()!=null)
             return _event.getResponse();
-        return null;
+        return _connection.getResponse();
     }
 
     /* ------------------------------------------------------------ */