diff options
author | Greg Wilkins | 2012-05-03 05:48:01 +0000 |
---|---|---|
committer | Greg Wilkins | 2012-05-03 05:48:01 +0000 |
commit | 8f8c3f77607704099dda239e5ddfb863626d9dcc (patch) | |
tree | a567f65e89ce9c5e89ab48de40e20b6c76b29ad7 | |
parent | ba4157d8e61ede860d602b3c556b8a87cd45c5f9 (diff) | |
download | org.eclipse.jetty.project-8f8c3f77607704099dda239e5ddfb863626d9dcc.tar.gz org.eclipse.jetty.project-8f8c3f77607704099dda239e5ddfb863626d9dcc.tar.xz org.eclipse.jetty.project-8f8c3f77607704099dda239e5ddfb863626d9dcc.zip |
jetty-9 ssl tests pass
-rw-r--r-- | jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java index c884bd54e7..6cb5517a5c 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SslConnection.java @@ -62,7 +62,6 @@ public class SslConnection extends AbstractAsyncConnection _appReadTask=callback; } }; - private IOFuture.Callback _writeable = new IOFuture.Callback() { @@ -75,7 +74,11 @@ public class SslConnection extends AbstractAsyncConnection @Override public void onFail(Throwable cause) { - LOG.warn("FAILED: "+cause); + LOG.debug("write FAILED",cause); + if (!_appWriteFuture.isComplete()) + _appWriteFuture.fail(cause); + else + LOG.warn("write FAILED",cause); } }; @@ -816,9 +819,6 @@ public class SslConnection extends AbstractAsyncConnection _lock.lock(); try { - if (!_appWriteFuture.isComplete()) - throw new IllegalStateException("previous write not complete"); - // Try to process all for (ByteBuffer b : _writeBuffers) { |