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/01/20 20:13:05 UTC
[1/2] mina git commit: Fixed many warnings (generics and useless
imports)
Repository: mina
Updated Branches:
refs/heads/2.0 4f19c1b51 -> 26c894d99
Fixed many warnings (generics and useless imports)
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/4be64ae1
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/4be64ae1
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/4be64ae1
Branch: refs/heads/2.0
Commit: 4be64ae13cc455ac514271937f38580b85072690
Parents: 4f19c1b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Dec 28 07:43:47 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Dec 28 07:43:47 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/mina/core/IoUtil.java | 3 +--
.../mina/core/filterchain/DefaultIoFilterChain.java | 2 +-
.../filterchain/DefaultIoFilterChainBuilder.java | 2 +-
.../org/apache/mina/core/future/DefaultIoFuture.java | 3 ++-
.../mina/util/byteaccess/CompositeByteArray.java | 1 +
.../mina/example/sumup/message/AbstractMessage.java | 2 ++
.../java/org/apache/mina/example/tapedeck/Main.java | 2 --
.../org/apache/mina/example/tcp/perf/TcpServer.java | 1 -
.../org/apache/mina/example/udp/MemoryMonitor.java | 3 ---
.../org/apache/mina/example/udp/perf/UdpClient.java | 1 -
.../org/apache/mina/example/udp/perf/UdpServer.java | 1 -
.../apache/mina/example/proxy/ProxyTestClient.java | 1 -
.../apache/mina/integration/beans/EnumEditor.java | 6 +++---
.../org/apache/mina/integration/beans/MapEditor.java | 5 +++--
.../integration/beans/PropertyEditorFactory.java | 15 +++++++++------
15 files changed, 23 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/IoUtil.java b/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
index 2cc54a4..98def63 100644
--- a/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
+++ b/mina-core/src/main/java/org/apache/mina/core/IoUtil.java
@@ -36,8 +36,7 @@ import org.apache.mina.core.session.IoSession;
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public class IoUtil {
-
+public final class IoUtil {
private static final IoSession[] EMPTY_SESSIONS = new IoSession[0];
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
index a30a57c..2d301c5 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
@@ -883,7 +883,7 @@ public class DefaultIoFilterChain implements IoFilterChain {
}
}
- private class EntryImpl implements Entry {
+ private final class EntryImpl implements Entry {
private EntryImpl prevEntry;
private EntryImpl nextEntry;
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
index e50826c..a8b0c05 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
@@ -545,7 +545,7 @@ public class DefaultIoFilterChainBuilder implements IoFilterChainBuilder {
entries.add(index, e);
}
- private class EntryImpl implements Entry {
+ private final class EntryImpl implements Entry {
private final String name;
private volatile IoFilter filter;
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java b/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
index fa59906..2a4ef4a 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
@@ -268,13 +268,14 @@ public class DefaultIoFuture implements IoFuture {
for (StackTraceElement s : stackTrace) {
try {
Class<?> cls = DefaultIoFuture.class.getClassLoader().loadClass(s.getClassName());
+
if (IoProcessor.class.isAssignableFrom(cls)) {
throw new IllegalStateException("DEAD LOCK: " + IoFuture.class.getSimpleName()
+ ".await() was invoked from an I/O processor thread. " + "Please use "
+ IoFutureListener.class.getSimpleName()
+ " or configure a proper thread model alternatively.");
}
- } catch (Exception cnfe) {
+ } catch (ClassNotFoundException cnfe) {
// Ignore
}
}
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-core/src/main/java/org/apache/mina/util/byteaccess/CompositeByteArray.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/util/byteaccess/CompositeByteArray.java b/mina-core/src/main/java/org/apache/mina/util/byteaccess/CompositeByteArray.java
index 36cf17a..e88a9be 100644
--- a/mina-core/src/main/java/org/apache/mina/util/byteaccess/CompositeByteArray.java
+++ b/mina-core/src/main/java/org/apache/mina/util/byteaccess/CompositeByteArray.java
@@ -227,6 +227,7 @@ public final class CompositeByteArray extends AbstractByteArray {
*/
public ByteArray removeLast() {
Node node = bas.removeLast();
+
return node == null ? null : node.getByteArray();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/sumup/message/AbstractMessage.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/message/AbstractMessage.java b/mina-example/src/main/java/org/apache/mina/example/sumup/message/AbstractMessage.java
index 619bbf3..593241d 100644
--- a/mina-example/src/main/java/org/apache/mina/example/sumup/message/AbstractMessage.java
+++ b/mina-example/src/main/java/org/apache/mina/example/sumup/message/AbstractMessage.java
@@ -27,6 +27,8 @@ import java.io.Serializable;
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public abstract class AbstractMessage implements Serializable {
+ static final long serialVersionUID = 1L;
+
private int sequence;
public int getSequence() {
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/tapedeck/Main.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/tapedeck/Main.java b/mina-example/src/main/java/org/apache/mina/example/tapedeck/Main.java
index ad903e7..cab03b4 100644
--- a/mina-example/src/main/java/org/apache/mina/example/tapedeck/Main.java
+++ b/mina-example/src/main/java/org/apache/mina/example/tapedeck/Main.java
@@ -21,7 +21,6 @@ package org.apache.mina.example.tapedeck;
import java.net.InetSocketAddress;
-import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineEncoder;
@@ -29,7 +28,6 @@ import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.StateMachineFactory;
import org.apache.mina.statemachine.StateMachineProxyBuilder;
-import org.apache.mina.statemachine.annotation.IoFilterTransition;
import org.apache.mina.statemachine.annotation.IoHandlerTransition;
import org.apache.mina.statemachine.context.IoSessionStateContextLookup;
import org.apache.mina.statemachine.context.StateContext;
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpServer.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpServer.java b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpServer.java
index dfd16a0..ffda31d 100644
--- a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpServer.java
+++ b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpServer.java
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger;
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.transport.socket.SocketSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java b/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
index 6ac988a..ca1c395 100644
--- a/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
+++ b/mina-example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
@@ -43,9 +43,6 @@ import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class MemoryMonitor {
-
- private static final long serialVersionUID = 1L;
-
public static final int PORT = 18567;
protected static final Dimension PANEL_SIZE = new Dimension(300, 200);
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpClient.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpClient.java b/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpClient.java
index 8753442..f267133 100644
--- a/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpClient.java
+++ b/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpClient.java
@@ -27,7 +27,6 @@ import org.apache.mina.core.service.IoConnector;
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.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.NioDatagramConnector;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpServer.java
----------------------------------------------------------------------
diff --git a/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpServer.java b/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpServer.java
index c75ca0c..af969a9 100644
--- a/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpServer.java
+++ b/mina-example/src/main/java/org/apache/mina/example/udp/perf/UdpServer.java
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger;
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.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
----------------------------------------------------------------------
diff --git a/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java b/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
index 443165c..0bbd85e 100644
--- a/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
+++ b/mina-example/src/test/java/org/apache/mina/example/proxy/ProxyTestClient.java
@@ -21,7 +21,6 @@ package org.apache.mina.example.proxy;
import java.net.InetSocketAddress;
import java.net.URL;
-import java.security.Security;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java
----------------------------------------------------------------------
diff --git a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java
index 3fe2a04..fcaeb68 100644
--- a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java
+++ b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/EnumEditor.java
@@ -36,7 +36,7 @@ public class EnumEditor extends AbstractPropertyEditor {
private final Class enumType;
- private final Set<Enum> enums;
+ private final Set<Enum<?>> enums;
public EnumEditor(Class enumType) {
if (enumType == null) {
@@ -56,7 +56,7 @@ public class EnumEditor extends AbstractPropertyEditor {
protected Object toValue(String text) throws IllegalArgumentException {
if (ORDINAL.matcher(text).matches()) {
int ordinal = Integer.parseInt(text);
- for (Enum e : enums) {
+ for (Enum<?> e : enums) {
if (e.ordinal() == ordinal) {
return e;
}
@@ -65,7 +65,7 @@ public class EnumEditor extends AbstractPropertyEditor {
throw new IllegalArgumentException("wrong ordinal: " + ordinal);
}
- for (Enum e : enums) {
+ for (Enum<?> e : enums) {
if (text.equalsIgnoreCase(e.toString())) {
return e;
}
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java
----------------------------------------------------------------------
diff --git a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java
index b0d478d..b3db62a 100644
--- a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java
+++ b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/MapEditor.java
@@ -79,8 +79,9 @@ public class MapEditor extends AbstractPropertyEditor {
@Override
protected final String toText(Object value) {
StringBuilder buf = new StringBuilder();
- for (Object o : ((Map) value).entrySet()) {
- Map.Entry entry = (Map.Entry) o;
+
+ for (Object o : ((Map<?,?>) value).entrySet()) {
+ Map.Entry<?,?> entry = (Map.Entry<?,?>) o;
Object ekey = entry.getKey();
Object evalue = entry.getValue();
http://git-wip-us.apache.org/repos/asf/mina/blob/4be64ae1/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java
----------------------------------------------------------------------
diff --git a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java
index 10b7dba..73b2ec0 100644
--- a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java
+++ b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/PropertyEditorFactory.java
@@ -39,9 +39,10 @@ public final class PropertyEditorFactory {
return new NullEditor();
}
- if (object instanceof Collection) {
+ if (object instanceof Collection<?>) {
Class<?> elementType = null;
- for (Object e : (Collection) object) {
+
+ for (Object e : (Collection<Object>) object) {
if (e != null) {
elementType = e.getClass();
break;
@@ -64,16 +65,18 @@ public final class PropertyEditorFactory {
if (object instanceof Map) {
Class<?> keyType = null;
Class<?> valueType = null;
- for (Object entry : ((Map) object).entrySet()) {
- Map.Entry e = (Map.Entry) entry;
- if (e.getKey() != null && e.getValue() != null) {
+
+ for (Object entry : ((Map<?,?>) object).entrySet()) {
+ Map.Entry<?,?> e = (Map.Entry<?,?>) entry;
+
+ if ((e.getKey() != null) && (e.getValue() != null)) {
keyType = e.getKey().getClass();
valueType = e.getValue().getClass();
break;
}
}
- if (keyType != null && valueType != null) {
+ if ((keyType != null) && (valueType != null)) {
return new MapEditor(keyType, valueType);
}
}
[2/2] mina git commit: Applied Radovan patch
Posted by el...@apache.org.
Applied Radovan patch
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/26c894d9
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/26c894d9
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/26c894d9
Branch: refs/heads/2.0
Commit: 26c894d992d8581db966e161ea35e87f6670350d
Parents: 4be64ae
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Jan 20 20:13:23 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Jan 20 20:13:23 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/mina/filter/ssl/SslHandler.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/26c894d9/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
index 973fd10..b3aaa3a 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
@@ -748,7 +748,15 @@ class SslHandler {
if (status == SSLEngineResult.Status.BUFFER_OVERFLOW) {
// We have to grow the target buffer, it's too small.
// Then we can call the unwrap method again
- appBuffer.capacity(sslEngine.getSession().getApplicationBufferSize());
+ int newCapacity = sslEngine.getSession().getApplicationBufferSize();
+
+ if (appBuffer.remaining() >= newCapacity) {
+ // The buffer is already larger than the max buffer size suggested by the SSL engine.
+ // Raising it any more will not make sense and it will end up in an endless loop. Throwing an error is safer
+ throw new SSLException("SSL buffer overflow");
+ }
+
+ appBuffer.capacity(newCapacity);
appBuffer.limit(appBuffer.capacity());
continue;
}