Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/activemq/browse/AMQ-2440 - more stomp+nip (and just nio) transport improvements 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@898774 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-01-13 14:38:52 +00:00
parent a593e35d82
commit db6827346b
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
View File

@ -79,11 +79,6 @@ public final class SelectorManager {
public synchronized void onWorkerEmptyEvent(SelectorWorker worker) { public synchronized void onWorkerEmptyEvent(SelectorWorker worker) {
freeWorkers.remove(worker); freeWorkers.remove(worker);
try {
// no more connections on worker, close it
worker.close();
} catch (IOException e) {
}
} }
public synchronized void onWorkerNotFullEvent(SelectorWorker worker) { public synchronized void onWorkerNotFullEvent(SelectorWorker worker) {

5
activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
View File

@ -16,6 +16,7 @@
*/ */
package org.apache.activemq.transport.nio; package org.apache.activemq.transport.nio;
import java.io.IOException;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
@ -69,6 +70,10 @@ public final class SelectorSelection {
worker.lock(); worker.lock();
try { try {
key.cancel(); key.cancel();
if (!worker.isRunning()) {
worker.close();
}
} catch (IOException e) {
} finally { } finally {
worker.unlock(); worker.unlock();
} }

7
activemq-core/src/main/java/org/apache/activemq/transport/nio/SelectorWorker.java
View File

@ -17,11 +17,11 @@
package org.apache.activemq.transport.nio; package org.apache.activemq.transport.nio;
import java.io.IOException; import java.io.IOException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
import java.nio.channels.Selector; import java.nio.channels.Selector;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -73,6 +73,7 @@ public class SelectorWorker implements Runnable {
while (isRunning()) { while (isRunning()) {
lockBarrier(); lockBarrier();
int count = selector.select(10); int count = selector.select(10);
if (count == 0) { if (count == 0) {
continue; continue;
@ -115,8 +116,10 @@ public class SelectorWorker implements Runnable {
} }
} }
} catch (ClosedSelectorException cse) {
// Don't accept any more selections
manager.onWorkerEmptyEvent(this);
} catch (IOException e) { } catch (IOException e) {
// Don't accept any more selections // Don't accept any more selections
manager.onWorkerEmptyEvent(this); manager.onWorkerEmptyEvent(this);

8
activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompNIOTransport.java
View File

@ -17,7 +17,6 @@
package org.apache.activemq.transport.stomp; package org.apache.activemq.transport.stomp;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
@ -32,7 +31,6 @@ import javax.net.SocketFactory;
import org.apache.activemq.command.Command; import org.apache.activemq.command.Command;
import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.nio.NIOInputStream;
import org.apache.activemq.transport.nio.NIOOutputStream; import org.apache.activemq.transport.nio.NIOOutputStream;
import org.apache.activemq.transport.nio.SelectorManager; import org.apache.activemq.transport.nio.SelectorManager;
import org.apache.activemq.transport.nio.SelectorSelection; import org.apache.activemq.transport.nio.SelectorSelection;
@ -131,7 +129,6 @@ public class StompNIOTransport extends TcpTransport {
} }
} catch (IOException e) { } catch (IOException e) {
selection.close();
onException(e); onException(e);
} catch (Throwable e) { } catch (Throwable e) {
onException(IOExceptionSupport.create(e)); onException(IOExceptionSupport.create(e));
@ -145,7 +142,10 @@ public class StompNIOTransport extends TcpTransport {
} }
protected void doStop(ServiceStopper stopper) throws Exception { protected void doStop(ServiceStopper stopper) throws Exception {
selection.disable(); try {
selection.close();
} catch (Exception e) {
}
super.doStop(stopper); super.doStop(stopper);
} }
} }