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 2014/12/22 09:38:19 UTC
[1/2] mina git commit: Removed some System.out
Repository: mina
Updated Branches:
refs/heads/2.0 65d730b9d -> 0b623816f
Removed some System.out
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/64726a8f
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/64726a8f
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/64726a8f
Branch: refs/heads/2.0
Commit: 64726a8fe75ffd62e9543954bc92066e4fc9a1f8
Parents: 65d730b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Dec 22 09:37:30 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Dec 22 09:37:30 2014 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/mina/filter/ssl/SslTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/64726a8f/mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java
----------------------------------------------------------------------
diff --git a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java
index 5f577dd..865fbb3 100644
--- a/mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java
+++ b/mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java
@@ -75,10 +75,10 @@ public class SslTest {
String line = (String) message;
if (line.startsWith("hello")) {
- System.out.println("Server got: 'hello', waiting for 'send'");
+ //System.out.println("Server got: 'hello', waiting for 'send'");
Thread.sleep(1500);
} else if (line.startsWith("send")) {
- System.out.println("Server got: 'send', sending 'data'");
+ //System.out.println("Server got: 'send', sending 'data'");
StringBuilder sb = new StringBuilder();
for ( int i = 0; i < 10000; i++) {
@@ -131,18 +131,18 @@ public class SslTest {
Socket parent = new Socket(address, port);
Socket socket = factory.createSocket(parent, address.getCanonicalHostName(), port, false);
- System.out.println("Client sending: hello");
+ //System.out.println("Client sending: hello");
socket.getOutputStream().write("hello \n".getBytes());
socket.getOutputStream().flush();
socket.setSoTimeout(1000000);
- System.out.println("Client sending: send");
+ //System.out.println("Client sending: send");
socket.getOutputStream().write("send\n".getBytes());
socket.getOutputStream().flush();
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
String line = in.readLine();
- System.out.println("Client got: " + line);
+ //System.out.println("Client got: " + line);
socket.close();
}
[2/2] mina git commit: Applied patch from DIRMINA-995
Posted by el...@apache.org.
Applied patch from DIRMINA-995
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/0b623816
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/0b623816
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/0b623816
Branch: refs/heads/2.0
Commit: 0b623816fcd8129099dc8d44cfc8c06b9c626b29
Parents: 64726a8
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Dec 22 09:38:09 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Dec 22 09:38:09 2014 +0100
----------------------------------------------------------------------
.../org/apache/mina/filter/ssl/SslHandler.java | 35 +++++++++-----------
1 file changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/0b623816/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 eb6e2a3..9135717 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
@@ -301,29 +301,26 @@ class SslHandler {
}
/* no qualifier */void flushScheduledEvents() {
- // Fire events only when no lock is hold for this handler.
- if (Thread.holdsLock(this)) {
- return;
- }
+ // Fire events only when the lock is available for this handler.
+ if (sslLock.tryLock()) {
- IoFilterEvent event;
+ IoFilterEvent event;
- // We need synchronization here inevitably because filterWrite can be
- // called simultaneously and cause 'bad record MAC' integrity error.
- sslLock.lock();
-
- try {
- while ((event = filterWriteEventQueue.poll()) != null) {
- NextFilter nextFilter = event.getNextFilter();
- nextFilter.filterWrite(session, (WriteRequest) event.getParameter());
- }
+ // We need synchronization here inevitably because filterWrite can be
+ // called simultaneously and cause 'bad record MAC' integrity error.
+ try {
+ while ((event = filterWriteEventQueue.poll()) != null) {
+ NextFilter nextFilter = event.getNextFilter();
+ nextFilter.filterWrite(session, (WriteRequest) event.getParameter());
+ }
- while ((event = messageReceivedEventQueue.poll()) != null) {
- NextFilter nextFilter = event.getNextFilter();
- nextFilter.messageReceived(session, event.getParameter());
+ while ((event = messageReceivedEventQueue.poll()) != null) {
+ NextFilter nextFilter = event.getNextFilter();
+ nextFilter.messageReceived(session, event.getParameter());
+ }
+ } finally {
+ sslLock.unlock();
}
- } finally {
- sslLock.unlock();
}
}