tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Thomas <ma...@apache.org>
Subject Re: svn commit: r1710107 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Date Thu, 22 Oct 2015 22:25:54 GMT
On 22/10/2015 23:15, markt@apache.org wrote:
> Author: markt
> Date: Thu Oct 22 22:15:04 2015
> New Revision: 1710107
> 
> URL: http://svn.apache.org/viewvc?rev=1710107&view=rev
> Log:
> Remove unused code
> 
> Modified:
>     tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
> 
> Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710107&r1=1710106&r2=1710107&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Thu Oct 22 22:15:04
2015
> @@ -111,10 +111,6 @@ public class SecureNio2Channel extends N
>          };
>      }
>  
> -    public void setSSLEngine(SSLEngine engine) {
> -        this.sslEngine = engine;
> -    }
> -

Sorry. The rest of this is temporary debug statements. I'll get them
removed shortly.

Mark


>      @Override
>      public void reset(AsynchronousSocketChannel channel, SocketWrapperBase<Nio2Channel>
socket)
>              throws IOException {
> @@ -213,6 +209,7 @@ public class SecureNio2Channel extends N
>          SSLEngineResult handshake = null;
>  
>          while (!handshakeComplete) {
> +            log.debug("Handshake status [" + handshakeStatus + "]" );
>              switch (handshakeStatus) {
>                  case NOT_HANDSHAKING: {
>                      //should never happen
> @@ -305,6 +302,7 @@ public class SecureNio2Channel extends N
>                  }
>                  default: throw new IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus",
handshakeStatus));
>              }
> +            log.debug("Handshake complete [" + handshakeComplete + "]" );
>          }
>          //return 0 if we are complete, otherwise recurse to process the task
>          return handshakeComplete ? 0 : handshakeInternal(async);
> @@ -463,6 +461,7 @@ public class SecureNio2Channel extends N
>          netOutBuffer.flip();
>          //set the status
>          handshakeStatus = result.getHandshakeStatus();
> +        log.debug("Result [" + result + "]");
>          return result;
>      }
>  
> @@ -499,6 +498,7 @@ public class SecureNio2Channel extends N
>              cont = result.getStatus() == SSLEngineResult.Status.OK &&
>                     handshakeStatus == HandshakeStatus.NEED_UNWRAP;
>          } while (cont);
> +        log.debug("Result [" + result + "]");
>          return result;
>      }
>  
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message