Author: markt Date: Mon Feb 1 19:20:29 2016 New Revision: 1727989 URL: http://svn.apache.org/viewvc?rev=1727989&view=rev Log: Format. No functional change.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1727989&r1=1727988&r2=1727989&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Feb 1 19:20:29 2016 @@ -547,18 +547,22 @@ public class SecureNioChannel extends Ni //compact the buffer netInBuffer.compact(); - if ( unwrap.getStatus()==Status.OK || unwrap.getStatus()==Status.BUFFER_UNDERFLOW ) { + if (unwrap.getStatus() == Status.OK || unwrap.getStatus() == Status.BUFFER_UNDERFLOW) { //we did receive some data, add it to our total read += unwrap.bytesProduced(); //perform any tasks if needed - if (unwrap.getHandshakeStatus() == HandshakeStatus.NEED_TASK) tasks(); + if (unwrap.getHandshakeStatus() == HandshakeStatus.NEED_TASK) { + tasks(); + } //if we need more network data, then bail out for now. - if ( unwrap.getStatus() == Status.BUFFER_UNDERFLOW ) break; - }else if ( unwrap.getStatus()==Status.BUFFER_OVERFLOW && read>0 ) { + if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) { + break; + } + } else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW && read > 0) { //buffer overflow can happen, if we have read data, then //empty out the dst buffer before we do another read break; - }else { + } else { //here we should trap BUFFER_OVERFLOW and call expand on the buffer //for now, throw an exception, as we initialized the buffers //in the constructor --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org