You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/29 01:02:05 UTC
[1/2] activemq-artemis git commit: removing more dead code on openwire
Repository: activemq-artemis
Updated Branches:
refs/heads/master 5818de8de -> aecea5142
removing more dead code on openwire
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/343ed61e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/343ed61e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/343ed61e
Branch: refs/heads/master
Commit: 343ed61e143dfb20e178edf69097300db55639ae
Parents: 5818de8
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Aug 28 17:05:27 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Aug 28 17:10:24 2015 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 62 +-------------------
1 file changed, 1 insertion(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/343ed61e/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 9a78bf9..bbb736a 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -94,7 +93,6 @@ import org.apache.activemq.state.ConnectionState;
import org.apache.activemq.state.ConsumerState;
import org.apache.activemq.state.ProducerState;
import org.apache.activemq.state.SessionState;
-import org.apache.activemq.thread.TaskRunnerFactory;
import org.apache.activemq.transport.TransmitCallback;
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.wireformat.WireFormat;
@@ -124,29 +122,16 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
private OpenWireFormat wireFormat;
- private boolean faultTolerantConnection;
-
private AMQConnectionContext context;
- private boolean manageable;
-
private boolean pendingStop;
private Throwable stopError = null;
- // should come from activemq server
- private final TaskRunnerFactory stopTaskRunnerFactory = null;
-
- private boolean starting;
-
private final AtomicBoolean stopping = new AtomicBoolean(false);
private final ReentrantReadWriteLock serviceLock = new ReentrantReadWriteLock();
- private final CountDownLatch stopped = new CountDownLatch(1);
-
- private boolean active;
-
protected final List<Command> dispatchQueue = new LinkedList<Command>();
private boolean inServiceException;
@@ -547,7 +532,6 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
state.reset(info);
- this.faultTolerantConnection = info.isFaultTolerant();
// Setup the context.
String clientId = info.getClientId();
context.setBroker(protocolManager);
@@ -558,11 +542,10 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
// for now we pass the manager as the connector and see what happens
// it should be related to activemq's Acceptor
context.setConnector(this.acceptorUsed);
- context.setFaultTolerant(faultTolerantConnection);
+ context.setFaultTolerant(info.isFaultTolerant());
context.setUserName(info.getUserName());
context.setWireFormatInfo(wireFormatInfo);
context.setReconnect(info.isFailoverReconnect());
- this.manageable = info.isManageable();
context.setConnectionState(state);
if (info.getClientIp() == null) {
info.setClientIp(getRemoteAddress());
@@ -705,22 +688,6 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
pendingStop = true;
stopError = cause;
}
- try {
- stopTaskRunnerFactory.execute(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(waitTime);
- stopAsync();
- }
- catch (InterruptedException e) {
- }
- }
- });
- }
- catch (Throwable t) {
- // log error
- }
}
}
@@ -728,37 +695,11 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
// If we're in the middle of starting then go no further... for now.
synchronized (this) {
pendingStop = true;
- if (starting) {
- // log
- return;
- }
}
if (stopping.compareAndSet(false, true)) {
if (context != null) {
context.getStopping().set(true);
}
- try {
- stopTaskRunnerFactory.execute(new Runnable() {
- @Override
- public void run() {
- serviceLock.writeLock().lock();
- try {
- doStop();
- }
- catch (Throwable e) {
- // LOG
- }
- finally {
- stopped.countDown();
- serviceLock.writeLock().unlock();
- }
- }
- });
- }
- catch (Throwable t) {
- // LOG
- stopped.countDown();
- }
}
}
@@ -777,7 +718,6 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor, S
// log
}
- active = false;
// Run the MessageDispatch callbacks so that message references get
// cleaned up.
synchronized (dispatchQueue) {
[2/2] activemq-artemis git commit: This closes #144
Posted by cl...@apache.org.
This closes #144
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/aecea514
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/aecea514
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/aecea514
Branch: refs/heads/master
Commit: aecea5142d30451254f823842027bd4d47e92459
Parents: 5818de8 343ed61
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Aug 28 19:01:46 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Aug 28 19:01:46 2015 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 62 +-------------------
1 file changed, 1 insertion(+), 61 deletions(-)
----------------------------------------------------------------------