Author: trustin
Date: Tue Aug 14 02:45:03 2007
New Revision: 565679
URL: http://svn.apache.org/viewvc?view=rev&rev=565679
Log:
Renamed ExpiringSessionRecycler to ExpiringIoSessionRecycler to get aligned
with its parent name: IoSessionRecycler
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringIoSessionRecycler.java
- copied, changed from r565666,
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java
mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
- copied, changed from r565676,
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
- copied, changed from r565676,
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
Copied:
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringIoSessionRecycler.java
(from r565666,
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringIoSessionRecycler.java?view=diff&rev=565679&p1=mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringIoSessionRecycler.java&r2=565679
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringSessionRecycler.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/ExpiringIoSessionRecycler.java
Tue Aug 14 02:45:03 2007
@@ -34,20 +34,20 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class ExpiringSessionRecycler implements IoSessionRecycler {
+public class ExpiringIoSessionRecycler implements IoSessionRecycler {
private ExpiringMap<Object, IoSession> sessionMap;
private ExpiringMap<Object, IoSession>.Expirer mapExpirer;
- public ExpiringSessionRecycler() {
+ public ExpiringIoSessionRecycler() {
this(ExpiringMap.DEFAULT_TIME_TO_LIVE);
}
- public ExpiringSessionRecycler(int timeToLive) {
+ public ExpiringIoSessionRecycler(int timeToLive) {
this(timeToLive, ExpiringMap.DEFAULT_EXPIRATION_INTERVAL);
}
- public ExpiringSessionRecycler(int timeToLive, int expirationInterval) {
+ public ExpiringIoSessionRecycler(int timeToLive, int expirationInterval) {
sessionMap = new ExpiringMap<Object, IoSession>(timeToLive,
expirationInterval);
mapExpirer = sessionMap.getExpirer();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=565679&r1=565678&r2=565679
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
Tue Aug 14 02:45:03 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.ExpiringSessionRecycler;
+import org.apache.mina.common.ExpiringIoSessionRecycler;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
@@ -54,7 +54,7 @@
*/
public class DatagramAcceptorDelegate extends AbstractIoAcceptor implements
IoAcceptor, DatagramService {
- private static final IoSessionRecycler DEFAULT_RECYCLER = new
ExpiringSessionRecycler();
+ private static final IoSessionRecycler DEFAULT_RECYCLER = new
ExpiringIoSessionRecycler();
private static volatile int nextId = 0;
Copied: mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
(from r565676,
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java?view=diff&rev=565679&p1=mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java&r1=565676&p2=mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java&r2=565679
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java Tue
Aug 14 02:45:03 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.io.IOException;
import java.net.SocketAddress;
Copied:
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
(from r565676,
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java?view=diff&rev=565679&p1=mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java&r1=565676&p2=mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java&r2=565679
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
Tue Aug 14 02:45:03 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?view=diff&rev=565679&r1=565678&r2=565679
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
Tue Aug 14 02:45:03 2007
@@ -26,7 +26,7 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.ExpiringSessionRecycler;
+import org.apache.mina.common.ExpiringIoSessionRecycler;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
@@ -48,7 +48,7 @@
public void testDatagramRecycler() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1024);
- ExpiringSessionRecycler recycler = new ExpiringSessionRecycler(1, 1);
+ ExpiringIoSessionRecycler recycler = new ExpiringIoSessionRecycler(1,
1);
MockHandler acceptorHandler = new MockHandler();
MockHandler connectorHandler = new MockHandler();
