You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/19 01:20:25 UTC

svn commit: r596168 - in /mina/trunk/core/src/main/java/org/apache/mina/common: ConnectFuture.java DefaultConnectFuture.java

Author: trustin
Date: Sun Nov 18 16:20:24 2007
New Revision: 596168

URL: http://svn.apache.org/viewvc?rev=596168&view=rev
Log:
Changed ConnectFuture to throw any RuntimeException like other API does.

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/common/ConnectFuture.java
    mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ConnectFuture.java?rev=596168&r1=596167&r2=596168&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ConnectFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ConnectFuture.java Sun Nov 18 16:20:24 2007
@@ -39,9 +39,9 @@
      * Returns {@link IoSession} which is the result of connect operation.
      *
      * @return <tt>null</tt> if the connect operation is not finished yet
-     * @throws RuntimeIoException if connection attempt failed by an exception
+     * @throws RuntimeException if connection attempt failed by an exception
      */
-    IoSession getSession() throws RuntimeIoException;
+    IoSession getSession();
 
     /**
      * Returns the cause of the connection failure.

Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java?rev=596168&r1=596167&r2=596168&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java Sun Nov 18 16:20:24 2007
@@ -48,10 +48,12 @@
     }
 
     @Override
-    public IoSession getSession() throws RuntimeIoException {
+    public IoSession getSession() {
         Object v = getValue();
-        if (v instanceof RuntimeIoException) {
-            throw (RuntimeIoException) v;
+        if (v instanceof RuntimeException) {
+            throw (RuntimeException) v;
+        } else if (v instanceof Error) {
+            throw (Error) v;
         } else if (v instanceof Throwable) {
             throw (RuntimeIoException) new RuntimeIoException(
                     "Failed to get the session.").initCause((Throwable) v);