You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/12/28 03:42:09 UTC
svn commit: r359354 - in /directory/network/trunk/src/java/org/apache/mina:
common/WriteTimeoutException.java
filter/codec/ProtocolDecoderException.java filter/support/SSLHandler.java
transport/vmpipe/VmPipeAddress.java util/Queue.java util/Stack.java
Author: trustin
Date: Tue Dec 27 18:42:00 2005
New Revision: 359354
URL: http://svn.apache.org/viewcvs?rev=359354&view=rev
Log:
Replaced tabs with four spaces
Modified:
directory/network/trunk/src/java/org/apache/mina/common/WriteTimeoutException.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolDecoderException.java
directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAddress.java
directory/network/trunk/src/java/org/apache/mina/util/Queue.java
directory/network/trunk/src/java/org/apache/mina/util/Stack.java
Modified: directory/network/trunk/src/java/org/apache/mina/common/WriteTimeoutException.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/WriteTimeoutException.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/WriteTimeoutException.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/WriteTimeoutException.java Tue Dec 27 18:42:00 2005
@@ -31,7 +31,7 @@
{
private static final long serialVersionUID = 3906931157944579121L;
- /**
+ /**
* Creates a new exception.
*/
public WriteTimeoutException()
Modified: directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolDecoderException.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolDecoderException.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolDecoderException.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolDecoderException.java Tue Dec 27 18:42:00 2005
@@ -32,7 +32,7 @@
{
private static final long serialVersionUID = 3545799879533408565L;
- private String hexdump;
+ private String hexdump;
/**
* Constructs a new instance.
Modified: directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java Tue Dec 27 18:42:00 2005
@@ -491,7 +491,7 @@
}
SSLEngineResult.Status status = unwrapHandshake();
if( ( initialHandshakeStatus != SSLEngineResult.HandshakeStatus.FINISHED
- && status == SSLEngineResult.Status.BUFFER_UNDERFLOW )
+ && status == SSLEngineResult.Status.BUFFER_UNDERFLOW )
|| isInboundDone() )
{
// We need more data or the session is closed
@@ -683,25 +683,25 @@
res.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NEED_UNWRAP );
initialHandshakeStatus = res.getHandshakeStatus();
-
- // If handshake finished, no data was produced, and the status is still ok,
- // try to unwrap more
- if (initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED
- && appBuffer.position() == 0
- && res.getStatus() == SSLEngineResult.Status.OK
- && inNetBuffer.hasRemaining()) {
- do {
- if (SessionLog.isDebugEnabled( session )) {
- SessionLog.debug( session, " extra handshake unwrap" );
+
+ // If handshake finished, no data was produced, and the status is still ok,
+ // try to unwrap more
+ if (initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED
+ && appBuffer.position() == 0
+ && res.getStatus() == SSLEngineResult.Status.OK
+ && inNetBuffer.hasRemaining()) {
+ do {
+ if (SessionLog.isDebugEnabled( session )) {
+ SessionLog.debug( session, " extra handshake unwrap" );
SessionLog.debug( session, " inNetBuffer: " + inNetBuffer );
SessionLog.debug( session, " appBuffer: " + appBuffer );
- }
- res = sslEngine.unwrap(inNetBuffer, appBuffer);
- if (SessionLog.isDebugEnabled( session )) {
+ }
+ res = sslEngine.unwrap(inNetBuffer, appBuffer);
+ if (SessionLog.isDebugEnabled( session )) {
SessionLog.debug( session, " Unwrap res:" + res );
- }
- } while (res.getStatus() == SSLEngineResult.Status.OK);
- }
+ }
+ } while (res.getStatus() == SSLEngineResult.Status.OK);
+ }
// prepare to be written again
inNetBuffer.compact();
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAddress.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAddress.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAddress.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAddress.java Tue Dec 27 18:42:00 2005
@@ -15,7 +15,7 @@
{
private static final long serialVersionUID = 3257844376976830515L;
- private final int port;
+ private final int port;
/**
* Creates a new instance with the specifid port number.
Modified: directory/network/trunk/src/java/org/apache/mina/util/Queue.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/util/Queue.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/util/Queue.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/util/Queue.java Tue Dec 27 18:42:00 2005
@@ -34,7 +34,7 @@
{
private static final long serialVersionUID = 3835151744526464313L;
- private static final int DEFAULT_CAPACITY = 4;
+ private static final int DEFAULT_CAPACITY = 4;
private static final int DEFAULT_MASK = DEFAULT_CAPACITY - 1;
Modified: directory/network/trunk/src/java/org/apache/mina/util/Stack.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/util/Stack.java?rev=359354&r1=359353&r2=359354&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/util/Stack.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/util/Stack.java Tue Dec 27 18:42:00 2005
@@ -31,7 +31,7 @@
{
private static final long serialVersionUID = 3546919169401434168L;
- private static final int DEFAULT_CAPACITY = 4;
+ private static final int DEFAULT_CAPACITY = 4;
private Object[] items;