svn commit: r599761 - in /mina/trunk/core/src/main/java/org/apache/mina: common/AbstractIoConnector.java common/AbstractPollingIoConnector.java transport/vmpipe/VmPipeConnector.java

[trustin]

Author: trustin
Date: Fri Nov 30 01:57:39 2007
New Revision: 599761

URL: http://svn.apache.org/viewvc?rev=599761&view=rev
Log:
Renamed doConnect to connect0

Modified:
    
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
    
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
    
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java?rev=599761&r1=599760&r2=599761&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java 
Fri Nov 30 01:57:39 2007
@@ -146,7 +146,7 @@
             }
         }
 
-        return doConnect(remoteAddress, localAddress);
+        return connect0(remoteAddress, localAddress);
     }
 
     /**
@@ -154,7 +154,7 @@
      *
      * @param localAddress <tt>null</tt> if no local address is specified
      */
-    protected abstract ConnectFuture doConnect(SocketAddress remoteAddress,
+    protected abstract ConnectFuture connect0(SocketAddress remoteAddress,
             SocketAddress localAddress);
 
     /**

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java?rev=599761&r1=599760&r2=599761&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractPollingIoConnector.java
 Fri Nov 30 01:57:39 2007
@@ -136,7 +136,7 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    protected final ConnectFuture doConnect(SocketAddress remoteAddress,
+    protected final ConnectFuture connect0(SocketAddress remoteAddress,
                                       SocketAddress localAddress) {
         H handle = null;
         boolean success = false;
@@ -220,14 +220,13 @@
             }
 
             H handle = req.handle;
-
             try {
                 close(handle);
             } catch (Exception e) {
                 ExceptionMonitor.getInstance().exceptionCaught(e);
+            } finally {
+                nHandles ++;
             }
-            
-            nHandles ++;
         }
         return nHandles;
     }

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?rev=599761&r1=599760&r2=599761&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
 Fri Nov 30 01:57:39 2007
@@ -61,7 +61,7 @@
     }
 
     @Override
-    protected ConnectFuture doConnect(SocketAddress remoteAddress,
+    protected ConnectFuture connect0(SocketAddress remoteAddress,
                                       SocketAddress localAddress) {
         VmPipe entry = VmPipeAcceptor.boundHandlers.get(remoteAddress);
         if (entry == null) {