svn commit: r555210 - in /mina: branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java

[trustin]

Author: trustin
Date: Wed Jul 11 01:46:17 2007
New Revision: 555210

URL: http://svn.apache.org/viewvc?view=rev&rev=555210
Log:
Fixed a trivial IllegalStateException in SSLFilter.filterClose


Modified:
    
mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
    
mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
    mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java

Modified: 
mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: 
http://svn.apache.org/viewvc/mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555210&r1=555209&r2=555210
==============================================================================
--- 
mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
 (original)
+++ 
mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
 Wed Jul 11 01:46:17 2007
@@ -554,7 +554,13 @@
     
     public void filterClose( final NextFilter nextFilter, final IoSession 
session ) throws SSLException
     {
-        SSLHandler handler = getSSLSessionHandler( session );
+        SSLHandler handler = getSSLSessionHandler0( session );
+        if (handler == null) {
+            // The connection might already have closed, or
+            // SSL might have not started yet.
+            nextFilter.filterClose( session );
+            return;
+        }
 
         WriteFuture future = null;
         try

Modified: 
mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: 
http://svn.apache.org/viewvc/mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555210&r1=555209&r2=555210
==============================================================================
--- 
mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
 (original)
+++ 
mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
 Wed Jul 11 01:46:17 2007
@@ -554,7 +554,13 @@
     
     public void filterClose( final NextFilter nextFilter, final IoSession 
session ) throws SSLException
     {
-        SSLHandler handler = getSSLSessionHandler( session );
+        SSLHandler handler = getSSLSessionHandler0( session );
+        if (handler == null) {
+            // The connection might already have closed, or
+            // SSL might have not started yet.
+            nextFilter.filterClose( session );
+            return;
+        }
 
         WriteFuture future = null;
         try

Modified: 
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java?view=diff&rev=555210&r1=555209&r2=555210
==============================================================================
--- mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java 
(original)
+++ mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java 
Wed Jul 11 01:46:17 2007
@@ -579,7 +579,13 @@
     @Override
     public void filterClose( final NextFilter nextFilter, final IoSession 
session ) throws SSLException
     {
-        SSLHandler handler = getSSLSessionHandler( session );
+        SSLHandler handler = getSSLSessionHandler0( session );
+        if (handler == null) {
+            // The connection might already have closed, or
+            // SSL might have not started yet.
+            nextFilter.filterClose( session );
+            return;
+        }
 
         WriteFuture future = null;
         try