SSL progress measured by process not inbound

2011-11-17 07:14:40 +11:00 · 2011-11-17 07:14:40 +11:00 · e48570bd5e
parent e322a28753
commit e48570bd5e
1 changed files with 2 additions and 8 deletions
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
@ -657,14 +657,8 @@ public class SslConnection extends AbstractConnection implements AsyncConnection

            while (now<end)
            {
-                process(null,null);
-                synchronized (SslConnection.this)
-                {
-                    if (_unwrapBuf!=null && _unwrapBuf.hasContent())
-                        break;
-                    if (_inbound!=null && _inbound.hasContent())
-                        break;
-                }
+                if (process(null,null))
+                    break;
                _endp.blockReadable(end-now);
                now = System.currentTimeMillis();
            }