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/22 03:59:48 UTC
svn commit: r597287 - in /mina/trunk:
core/src/main/java/org/apache/mina/transport/socket/
core/src/main/java/org/apache/mina/transport/socket/nio/
transport-apr/src/main/java/org/apache/mina/transport/socket/apr/
Author: trustin
Date: Wed Nov 21 18:59:46 2007
New Revision: 597287
URL: http://svn.apache.org/viewvc?rev=597287&view=rev
Log:
Applied Java 5 covariant return type to IoConnector.defaultRemoteAddress
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java?rev=597287&r1=597286&r2=597287&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java Wed Nov 21 18:59:46 2007
@@ -19,6 +19,8 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
+
import org.apache.mina.common.IoConnector;
/**
@@ -28,4 +30,6 @@
* @version $Rev$, $Date$
*/
public interface DatagramConnector extends DatagramService, IoConnector {
+ InetSocketAddress getDefaultRemoteAddress();
+ void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java?rev=597287&r1=597286&r2=597287&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java Wed Nov 21 18:59:46 2007
@@ -19,6 +19,8 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
+
import org.apache.mina.common.IoConnector;
/**
@@ -28,4 +30,6 @@
* @version $Rev$, $Date$
*/
public interface SocketConnector extends SocketService, IoConnector {
+ InetSocketAddress getDefaultRemoteAddress();
+ void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java?rev=597287&r1=597286&r2=597287&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java Wed Nov 21 18:59:46 2007
@@ -19,6 +19,7 @@
*/
package org.apache.mina.transport.socket.nio;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.channels.DatagramChannel;
import java.util.Iterator;
@@ -69,6 +70,15 @@
@Override
public DatagramSessionConfig getSessionConfig() {
return (DatagramSessionConfig) super.getSessionConfig();
+ }
+
+ @Override
+ public InetSocketAddress getDefaultRemoteAddress() {
+ return (InetSocketAddress) super.getDefaultRemoteAddress();
+ }
+
+ public void setDefaultRemoteAddress(InetSocketAddress defaultRemoteAddress) {
+ super.setDefaultRemoteAddress(defaultRemoteAddress);
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java?rev=597287&r1=597286&r2=597287&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java Wed Nov 21 18:59:46 2007
@@ -20,6 +20,7 @@
package org.apache.mina.transport.socket.nio;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
@@ -95,7 +96,15 @@
return (SocketSessionConfig) super.getSessionConfig();
}
+ @Override
+ public InetSocketAddress getDefaultRemoteAddress() {
+ return (InetSocketAddress) super.getDefaultRemoteAddress();
+ }
+ public void setDefaultRemoteAddress(InetSocketAddress defaultRemoteAddress) {
+ super.setDefaultRemoteAddress(defaultRemoteAddress);
+ }
+
@Override
protected Iterator<SocketChannel> allHandles() {
return new SocketChannelIterator(selector.keys());
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java?rev=597287&r1=597286&r2=597287&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java Wed Nov 21 18:59:46 2007
@@ -333,6 +333,15 @@
public SocketSessionConfig getSessionConfig() {
return (SocketSessionConfig) super.getSessionConfig();
}
+
+ @Override
+ public InetSocketAddress getDefaultRemoteAddress() {
+ return (InetSocketAddress) super.getDefaultRemoteAddress();
+ }
+
+ public void setDefaultRemoteAddress(InetSocketAddress defaultRemoteAddress) {
+ super.setDefaultRemoteAddress(defaultRemoteAddress);
+ }
private void throwException(int code) throws IOException {
throw new IOException(