Author: elecharny Date: Tue Apr 28 22:20:36 2009 New Revision: 769571 URL: http://svn.apache.org/viewvc?rev=769571&view=rev Log: Restore back the initial API (will fix DIRMINA-706)
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java?rev=769571&r1=769570&r2=769571&view=diff ============================================================================== --- mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java (original) +++ mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java Tue Apr 28 22:20:36 2009 @@ -212,20 +212,36 @@ /** * {...@inheritdoc} */ - public final void bind(SocketAddress... addresses) throws IOException { - if ((addresses == null) || (addresses.length == 0)) { + public final void bind(SocketAddress localAddress) throws IOException { + if (localAddress == null) { + throw new NullPointerException("localAddress"); + } + + List<SocketAddress> localAddresses = new ArrayList<SocketAddress>(1); + localAddresses.add(localAddress); + bind(localAddresses); + } + + + /** + * {...@inheritdoc} + */ + public final void bind(SocketAddress firstLocalAddress, SocketAddress... otherLocalAddresses) throws IOException { + if (firstLocalAddress == null) { bind(getDefaultLocalAddresses()); return; } - if (addresses.length == 1) { - List<SocketAddress> localAddresses = new ArrayList<SocketAddress>(addresses.length); - for (SocketAddress address:addresses) { + List<SocketAddress> localAddresses = new ArrayList<SocketAddress>(2); + localAddresses.add(firstLocalAddress); + + if (otherLocalAddresses != null) { + for (SocketAddress address:otherLocalAddresses) { localAddresses.add(address); } - - bind(localAddresses); } + + bind(localAddresses); } /** Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java?rev=769571&r1=769570&r2=769571&view=diff ============================================================================== --- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java (original) +++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java Tue Apr 28 22:20:36 2009 @@ -125,12 +125,20 @@ void bind() throws IOException; /** + * Binds to the specified local address and start to accept incoming + * connections. + * + * @throws IOException if failed to bind + */ + void bind(SocketAddress localAddress) throws IOException; + + /** * Binds to the specified local addresses and start to accept incoming * connections. If no address is given, bind on the default local address. * * @throws IOException if failed to bind */ - void bind(SocketAddress... addresses) throws IOException; + void bind(SocketAddress firstLocalAddress, SocketAddress... addresses) throws IOException; /** * Binds to the specified local addresses and start to accept incoming