svn commit: r593499 - in /mina/trunk/core/src/main/java/org/apache/mina: common/AbstractIoAcceptor.java transport/vmpipe/VmPipeAcceptor.java

[trustin]

Author: trustin
Date: Fri Nov  9 03:48:23 2007
New Revision: 593499

URL: http://svn.apache.org/viewvc?rev=593499&view=rev
Log:
Fixed failing tests


Modified:
    mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
    
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java?rev=593499&r1=593498&r2=593499&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java 
(original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java 
Fri Nov  9 03:48:23 2007
@@ -58,11 +58,7 @@
     }
 
     public void setLocalAddress(SocketAddress localAddress) {
-        if (localAddress == null) {
-            throw new NullPointerException("localAddress");
-        }
-        
-        setLocalAddresses(localAddress);
+        setLocalAddresses(new SocketAddress[] { localAddress });
     }
 
     public List<SocketAddress> getLocalAddresses() {
@@ -76,9 +72,6 @@
         
         List<SocketAddress> list = new ArrayList<SocketAddress>();
         for (SocketAddress a: localAddresses) {
-            if (a == null) {
-                continue;
-            }
             list.add(a);
         }
         
@@ -99,10 +92,8 @@
             Collection<SocketAddress> newLocalAddresses = 
                 new ArrayList<SocketAddress>();
             for (SocketAddress a: localAddresses) {
-                if (a == null) {
-                    continue;
-                }
-                if (!getTransportMetadata().getAddressType().isAssignableFrom(
+                if (a != null &&
+                    !getTransportMetadata().getAddressType().isAssignableFrom(
                                 a.getClass())) {
                     throw new IllegalArgumentException("localAddress type: "
                             + a.getClass().getSimpleName() + " (expected: "

Modified: 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?rev=593499&r1=593498&r2=593499&view=diff
==============================================================================
--- 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
 (original)
+++ 
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
 Fri Nov  9 03:48:23 2007
@@ -79,7 +79,7 @@
         synchronized (boundHandlers) {
             for (SocketAddress a: localAddresses) {
                 VmPipeAddress localAddress = (VmPipeAddress) a;
-                if (localAddress.getPort() == 0) {
+                if (localAddress == null || localAddress.getPort() == 0) {
                     localAddress = null;
                     for (int i = 1; i < Integer.MAX_VALUE; i++) {
                         VmPipeAddress newLocalAddress = new VmPipeAddress(i);