Author: elecharny
Date: Mon Apr 11 21:00:34 2011
New Revision: 1091209
URL: http://svn.apache.org/viewvc?rev=1091209&view=rev
Log:
reverted the release
Modified:
mina/branches/2.0.3/distribution/pom.xml
mina/branches/2.0.3/mina-core/pom.xml
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
mina/branches/2.0.3/mina-example/pom.xml
mina/branches/2.0.3/mina-filter-compression/pom.xml
mina/branches/2.0.3/mina-integration-beans/pom.xml
mina/branches/2.0.3/mina-integration-jmx/pom.xml
mina/branches/2.0.3/mina-integration-ognl/pom.xml
mina/branches/2.0.3/mina-integration-xbean/pom.xml
mina/branches/2.0.3/mina-legal/pom.xml
mina/branches/2.0.3/mina-statemachine/pom.xml
mina/branches/2.0.3/mina-transport-apr/pom.xml
mina/branches/2.0.3/mina-transport-serial/pom.xml
mina/branches/2.0.3/pom.xml
Modified: mina/branches/2.0.3/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/distribution/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/distribution/pom.xml (original)
+++ mina/branches/2.0.3/distribution/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
Modified: mina/branches/2.0.3/mina-core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-core/pom.xml (original)
+++ mina/branches/2.0.3/mina-core/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
Modified:
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
---
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
(original)
+++
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
Mon Apr 11 21:00:34 2011
@@ -401,6 +401,15 @@ public abstract class AbstractPollingCon
nHandles += registerHandles();
+ if (nHandles == 0) {
+ synchronized (lock) {
+ if (registerQueue.isEmpty() &&
cancelQueue.isEmpty()) {
+ acceptor = null;
+ break;
+ }
+ }
+ }
+
if (selected > 0) {
processReadySessions(selectedHandles());
}
@@ -410,15 +419,6 @@ public abstract class AbstractPollingCon
nHandles -= unregisterHandles();
notifyIdleSessions(currentTime);
-
- if (nHandles == 0) {
- synchronized (lock) {
- if (registerQueue.isEmpty() &&
cancelQueue.isEmpty()) {
- acceptor = null;
- break;
- }
- }
- }
} catch (ClosedSelectorException cse) {
// If the selector has been closed, we can exit the loop
break;
Modified:
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
---
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
(original)
+++
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
Mon Apr 11 21:00:34 2011
@@ -417,15 +417,6 @@ public abstract class AbstractPollingIoA
// listen on
nHandles += registerHandles();
- if (selected > 0) {
- // We have some connection request, let's process
- // them here.
- processHandles(selectedHandles());
- }
-
- // check to see if any cancellation request has been made.
- nHandles -= unregisterHandles();
-
// Now, if the number of registred handles is 0, we can
// quit the loop: we don't have any socket listening
// for incoming connection.
@@ -444,6 +435,15 @@ public abstract class AbstractPollingIoA
assert (acceptorRef.get() == this);
}
+
+ if (selected > 0) {
+ // We have some connection request, let's process
+ // them here.
+ processHandles(selectedHandles());
+ }
+
+ // check to see if any cancellation request has been made.
+ nHandles -= unregisterHandles();
} catch (ClosedSelectorException cse) {
// If the selector has been closed, we can exit the loop
break;
Modified:
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
---
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
(original)
+++
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
Mon Apr 11 21:00:34 2011
@@ -390,13 +390,16 @@ public abstract class AbstractPollingIoC
private int cancelKeys() {
int nHandles = 0;
+
for (; ;) {
ConnectionRequest req = cancelQueue.poll();
+
if (req == null) {
break;
}
H handle = req.handle;
+
try {
close(handle);
} catch (Exception e) {
@@ -405,6 +408,11 @@ public abstract class AbstractPollingIoC
nHandles ++;
}
}
+
+ if ( nHandles > 0 ) {
+ wakeup();
+ }
+
return nHandles;
}
@@ -479,14 +487,7 @@ public abstract class AbstractPollingIoC
nHandles += registerNew();
- if (selected > 0) {
- nHandles -= processConnections(selectedHandles());
- }
-
- processTimedOutSessions(allHandles());
-
- nHandles -= cancelKeys();
-
+ // get a chance to get out of the connector loop, if we
don't have any more handles
if (nHandles == 0) {
connectorRef.set(null);
@@ -502,6 +503,14 @@ public abstract class AbstractPollingIoC
assert (connectorRef.get() == this);
}
+
+ if (selected > 0) {
+ nHandles -= processConnections(selectedHandles());
+ }
+
+ processTimedOutSessions(allHandles());
+
+ nHandles -= cancelKeys();
} catch (ClosedSelectorException cse) {
// If the selector has been closed, we can exit the loop
break;
Modified:
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
---
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java
(original)
+++
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java
Mon Apr 11 21:00:34 2011
@@ -175,22 +175,27 @@ public class DemuxingProtocolDecoder ext
}
}
- MessageDecoderResult result = state.currentDecoder.decode(session, in,
- out);
- if (result == MessageDecoder.OK) {
- state.currentDecoder = null;
- return true;
- } else if (result == MessageDecoder.NEED_DATA) {
- return false;
- } else if (result == MessageDecoder.NOT_OK) {
- state.currentDecoder = null;
- throw new ProtocolDecoderException(
- "Message decoder returned NOT_OK.");
- } else {
- state.currentDecoder = null;
- throw new IllegalStateException(
- "Unexpected decode result (see your decode()): "
- + result);
+ try {
+ MessageDecoderResult result = state.currentDecoder.decode(session,
in,
+ out);
+ if (result == MessageDecoder.OK) {
+ state.currentDecoder = null;
+ return true;
+ } else if (result == MessageDecoder.NEED_DATA) {
+ return false;
+ } else if (result == MessageDecoder.NOT_OK) {
+ state.currentDecoder = null;
+ throw new ProtocolDecoderException(
+ "Message decoder returned NOT_OK.");
+ } else {
+ state.currentDecoder = null;
+ throw new IllegalStateException(
+ "Unexpected decode result (see your decode()): "
+ + result);
+ }
+ } catch (Exception e) {
+ state.currentDecoder = null;
+ throw e;
}
}
Modified:
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
---
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
(original)
+++
mina/branches/2.0.3/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Mon Apr 11 21:00:34 2011
@@ -28,11 +28,14 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.Executor;
+import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.polling.AbstractPollingIoConnector;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
import org.apache.mina.core.service.SimpleIoProcessorPool;
import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
import org.apache.mina.transport.socket.SocketConnector;
import org.apache.mina.transport.socket.SocketSessionConfig;
@@ -212,6 +215,10 @@ public final class NioSocketConnector
key.cancel();
}
+ IoSession session = (IoSession)key.attach(null);
+ IoFilterChain filterChain = session.getFilterChain();
+ filterChain.fireSessionClosed();
+
handle.close();
}
Modified: mina/branches/2.0.3/mina-example/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-example/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-example/pom.xml (original)
+++ mina/branches/2.0.3/mina-example/pom.xml Mon Apr 11 21:00:34 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
Modified: mina/branches/2.0.3/mina-filter-compression/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-filter-compression/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-filter-compression/pom.xml (original)
+++ mina/branches/2.0.3/mina-filter-compression/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
Modified: mina/branches/2.0.3/mina-integration-beans/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-integration-beans/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-integration-beans/pom.xml (original)
+++ mina/branches/2.0.3/mina-integration-beans/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
Modified: mina/branches/2.0.3/mina-integration-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-integration-jmx/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-integration-jmx/pom.xml (original)
+++ mina/branches/2.0.3/mina-integration-jmx/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
Modified: mina/branches/2.0.3/mina-integration-ognl/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-integration-ognl/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-integration-ognl/pom.xml (original)
+++ mina/branches/2.0.3/mina-integration-ognl/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
Modified: mina/branches/2.0.3/mina-integration-xbean/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-integration-xbean/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-integration-xbean/pom.xml (original)
+++ mina/branches/2.0.3/mina-integration-xbean/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: mina/branches/2.0.3/mina-legal/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-legal/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-legal/pom.xml (original)
+++ mina/branches/2.0.3/mina-legal/pom.xml Mon Apr 11 21:00:34 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
Modified: mina/branches/2.0.3/mina-statemachine/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-statemachine/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-statemachine/pom.xml (original)
+++ mina/branches/2.0.3/mina-statemachine/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
Modified: mina/branches/2.0.3/mina-transport-apr/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-transport-apr/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-transport-apr/pom.xml (original)
+++ mina/branches/2.0.3/mina-transport-apr/pom.xml Mon Apr 11 21:00:34 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
Modified: mina/branches/2.0.3/mina-transport-serial/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/mina-transport-serial/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/mina-transport-serial/pom.xml (original)
+++ mina/branches/2.0.3/mina-transport-serial/pom.xml Mon Apr 11 21:00:34 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
Modified: mina/branches/2.0.3/pom.xml
URL:
http://svn.apache.org/viewvc/mina/branches/2.0.3/pom.xml?rev=1091209&r1=1091208&r2=1091209&view=diff
==============================================================================
--- mina/branches/2.0.3/pom.xml (original)
+++ mina/branches/2.0.3/pom.xml Mon Apr 11 21:00:34 2011
@@ -33,7 +33,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
