You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2016/02/03 08:57:57 UTC
[1/2] mina git commit: Fixed a double next() call.
Repository: mina
Updated Branches:
refs/heads/2.0 77e29bb84 -> 8569651aa
Fixed a double next() call.
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/11c0d2b7
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/11c0d2b7
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/11c0d2b7
Branch: refs/heads/2.0
Commit: 11c0d2b7c5f369b74f0e1a527c92da32054b0be3
Parents: 77e29bb
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Feb 2 22:29:15 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Feb 2 22:29:15 2016 +0100
----------------------------------------------------------------------
.../org/apache/mina/core/polling/AbstractPollingIoProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/11c0d2b7/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
index 0bf8979..09182d5 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
@@ -1138,7 +1138,7 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
IoSession session = i.next();
if (session.isActive()) {
- scheduleRemove(i.next());
+ scheduleRemove((S)session);
hasKeys = true;
}
}
[2/2] mina git commit: Moved back to 2.0.12-SNAPSHOT
Posted by el...@apache.org.
Moved back to 2.0.12-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/8569651a
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/8569651a
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/8569651a
Branch: refs/heads/2.0
Commit: 8569651aa6f879fa82233df60eac29bd976a17ae
Parents: 11c0d2b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Feb 3 08:57:31 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Feb 3 08:57:31 2016 +0100
----------------------------------------------------------------------
distribution/pom.xml | 2 +-
mina-benchmarks/pom.xml | 2 +-
mina-core/pom.xml | 2 +-
mina-example/pom.xml | 2 +-
.../org/apache/mina/example/echoserver/EchoProtocolHandler.java | 2 ++
mina-filter-compression/pom.xml | 2 +-
mina-http/pom.xml | 2 +-
mina-integration-beans/pom.xml | 2 +-
mina-integration-jmx/pom.xml | 2 +-
mina-integration-ognl/pom.xml | 2 +-
mina-integration-xbean/pom.xml | 2 +-
mina-legal/pom.xml | 2 +-
mina-statemachine/pom.xml | 2 +-
mina-transport-apr/pom.xml | 2 +-
mina-transport-serial/pom.xml | 2 +-
pom.xml | 2 +-
16 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 30e9f29..67d2adb 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>mina-parent</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/mina-benchmarks/pom.xml b/mina-benchmarks/pom.xml
index 8033aa4..9255879 100755
--- a/mina-benchmarks/pom.xml
+++ b/mina-benchmarks/pom.xml
@@ -29,7 +29,7 @@
<artifactId>mina-benchmarks</artifactId>
<groupId>org.apache.mina</groupId>
- <version>2.0.8-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
<name>Apache MINA Benchmarks tests</name>
<properties>
<!-- defined in order to run against a different MINA version -->
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-core/pom.xml
----------------------------------------------------------------------
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index fced722..2bc56d6 100644
--- a/mina-core/pom.xml
+++ b/mina-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-core</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-example/pom.xml
----------------------------------------------------------------------
diff --git a/mina-example/pom.xml b/mina-example/pom.xml
index 4bfbeb7..0943f02 100644
--- a/mina-example/pom.xml
+++ b/mina-example/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-example</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java b/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
index ee9e180..ffc2bdb 100644
--- a/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
+++ b/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
@@ -20,10 +20,12 @@
package org.apache.mina.example.echoserver;
import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.WriteFuture;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.ssl.SslFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-filter-compression/pom.xml
----------------------------------------------------------------------
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index b362030..a031ebc 100644
--- a/mina-filter-compression/pom.xml
+++ b/mina-filter-compression/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-http/pom.xml
----------------------------------------------------------------------
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index e961a5e..44cde5d 100644
--- a/mina-http/pom.xml
+++ b/mina-http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-http</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-integration-beans/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-beans/pom.xml b/mina-integration-beans/pom.xml
index 725df45..88de013 100644
--- a/mina-integration-beans/pom.xml
+++ b/mina-integration-beans/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-integration-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index 3d08f16..8c1aed9 100644
--- a/mina-integration-jmx/pom.xml
+++ b/mina-integration-jmx/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-integration-ognl/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-ognl/pom.xml b/mina-integration-ognl/pom.xml
index 919dd75..9191a78 100644
--- a/mina-integration-ognl/pom.xml
+++ b/mina-integration-ognl/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-integration-xbean/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 9ddd68d..1c573a0 100644
--- a/mina-integration-xbean/pom.xml
+++ b/mina-integration-xbean/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-legal/pom.xml
----------------------------------------------------------------------
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index 2172ffb..b81e1fa 100644
--- a/mina-legal/pom.xml
+++ b/mina-legal/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-legal</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index d689fb8..02615c1 100644
--- a/mina-statemachine/pom.xml
+++ b/mina-statemachine/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-statemachine</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-transport-apr/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index 40201d9..f56d267 100644
--- a/mina-transport-apr/pom.xml
+++ b/mina-transport-apr/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/mina-transport-serial/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index 4773c3b..70b3c17 100644
--- a/mina-transport-serial/pom.xml
+++ b/mina-transport-serial/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>mina-parent</artifactId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
http://git-wip-us.apache.org/repos/asf/mina/blob/8569651a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84c10b8..2709007 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.0.13-SNAPSHOT</version>
+ <version>2.0.12-SNAPSHOT</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>