Author: trustin
Date: Mon Apr 16 18:54:35 2007
New Revision: 529467
URL: http://svn.apache.org/viewvc?view=rev&rev=529467
Log:
Removed IoService.setSessionConfig() as discussed in the mailing list
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.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/IoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java Mon Apr
16 18:54:35 2007
@@ -76,17 +76,6 @@
IoSessionConfig getSessionConfig();
/**
- * Sets the default configuration of the new [EMAIL PROTECTED] IoSession}s
- * created by this service.
- *
- * @param config the new default config.
- * @throws IllegalArgumentException if the type of the specified config
doesn't
- * match the [EMAIL PROTECTED] IoSessionConfig}
implementation supported by
- * this [EMAIL PROTECTED] IoService}.
- */
- void setSessionConfig( IoSessionConfig config );
-
- /**
* Returns the [EMAIL PROTECTED] IoFilterChainBuilder} which will build the
* [EMAIL PROTECTED] IoFilterChain} of all [EMAIL PROTECTED] IoSession}s
which is created
* by this service.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
Mon Apr 16 18:54:35 2007
@@ -59,8 +59,19 @@
protected BaseIoService( IoSessionConfig sessionConfig )
{
- this.listeners = new IoServiceListenerSupport( this );
- setSessionConfig( sessionConfig );
+ if (sessionConfig == null) {
+ throw new NullPointerException("sessionConfig");
+ }
+
+ if (!getTransportType().getSessionConfigType().isAssignableFrom(
+ sessionConfig.getClass())) {
+ throw new IllegalArgumentException(
+ "sessionConfig type: " + sessionConfig.getClass() +
+ " (expected: " + getTransportType().getSessionConfigType()
+ ")");
+ }
+
+ this.listeners = new IoServiceListenerSupport(this);
+ this.sessionConfig = sessionConfig;
}
public IoFilterChainBuilder getFilterChainBuilder()
@@ -129,19 +140,4 @@
{
return sessionConfig;
}
-
- public void setSessionConfig( IoSessionConfig sessionConfig )
- {
- if( sessionConfig == null )
- {
- throw new NullPointerException( "sessionConfig" );
- }
- if( ! getTransportType().getSessionConfigType().isAssignableFrom(
sessionConfig.getClass() ) )
- {
- throw new IllegalArgumentException( "sessionConfig type: "
- + sessionConfig.getClass()
- + " (expected: " +
getTransportType().getSessionConfigType() + ")" );
- }
- this.sessionConfig = sessionConfig;
- }
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
Mon Apr 16 18:54:35 2007
@@ -133,11 +133,6 @@
return delegate.getSessionConfig();
}
- public void setSessionConfig( IoSessionConfig config )
- {
- delegate.setSessionConfig( config );
- }
-
public void setHandler( IoHandler handler )
{
delegate.setHandler( handler );
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
Mon Apr 16 18:54:35 2007
@@ -123,11 +123,6 @@
return delegate.getSessionConfig();
}
- public void setSessionConfig( IoSessionConfig config )
- {
- delegate.setSessionConfig( config );
- }
-
public void setHandler( IoHandler handler )
{
delegate.setHandler( handler );
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
Mon Apr 16 18:54:35 2007
@@ -24,7 +24,6 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.support.DelegatedIoAcceptor;
import org.apache.mina.transport.socket.nio.support.DatagramAcceptorDelegate;
@@ -66,14 +65,9 @@
return ( ( DatagramAcceptorDelegate ) delegate ).getLocalAddress();
}
- // These two methods are overriden to work around a problem with
+ // This method is overriden to work around a problem with
// bean property access mechanism.
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
- }
-
@Override
public void setLocalAddress(SocketAddress localAddress) {
super.setLocalAddress(localAddress);
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
Mon Apr 16 18:54:35 2007
@@ -22,7 +22,6 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.support.DelegatedIoConnector;
import org.apache.mina.transport.socket.nio.support.DatagramConnectorDelegate;
import org.apache.mina.util.NewThreadExecutor;
@@ -56,13 +55,5 @@
@Override
public DatagramSessionConfig getSessionConfig() {
return ( ( DatagramConnectorDelegate ) delegate ).getSessionConfig();
- }
-
- // This method is overriden to work around a problem with
- // bean property access mechanism.
-
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
Mon Apr 16 18:54:35 2007
@@ -36,7 +36,6 @@
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoAcceptor;
@@ -176,14 +175,9 @@
return (InetSocketAddress) super.getLocalAddress();
}
- // These two methods are overriden to work around a problem with
+ // This method is overriden to work around a problem with
// bean property access mechanism.
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
- }
-
@Override
public void setLocalAddress(SocketAddress localAddress) {
super.setLocalAddress(localAddress);
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
Mon Apr 16 18:54:35 2007
@@ -34,7 +34,6 @@
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.AbstractIoFilterChain;
@@ -134,14 +133,6 @@
return (SocketSessionConfig) super.getSessionConfig();
}
- // This method is overriden to work around a problem with
- // bean property access mechanism.
-
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
- }
-
/**
* How many seconds to keep the connection thread alive between connection
requests
*
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?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
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
Mon Apr 16 18:54:35 2007
@@ -26,7 +26,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoAcceptor;
import org.apache.mina.transport.vmpipe.support.VmPipe;
@@ -64,14 +63,9 @@
return (VmPipeAddress) super.getLocalAddress();
}
- // These two methods are overriden to work around a problem with
+ // This method is overriden to work around a problem with
// bean property access mechanism.
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
- }
-
@Override
public void setLocalAddress(SocketAddress localAddress) {
super.setLocalAddress(localAddress);
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?view=diff&rev=529467&r1=529466&r2=529467
==============================================================================
---
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
Mon Apr 16 18:54:35 2007
@@ -30,7 +30,6 @@
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.AbstractIoFilterChain;
import org.apache.mina.common.support.BaseIoConnector;
@@ -67,14 +66,6 @@
return (VmPipeSessionConfig) super.getSessionConfig();
}
- // This method is overriden to work around a problem with
- // bean property access mechanism.
-
- @Override
- public void setSessionConfig(IoSessionConfig sessionConfig) {
- super.setSessionConfig(sessionConfig);
- }
-
@Override
protected ConnectFuture doConnect( SocketAddress remoteAddress,
SocketAddress localAddress )
{
