Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2AD5D200C3E for ; Tue, 21 Mar 2017 18:37:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 292F6160B81; Tue, 21 Mar 2017 17:37:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3A77C160B6E for ; Tue, 21 Mar 2017 18:37:36 +0100 (CET) Received: (qmail 28065 invoked by uid 500); 21 Mar 2017 17:37:35 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 28055 invoked by uid 99); 21 Mar 2017 17:37:35 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Mar 2017 17:37:35 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 79D373A05B4 for ; Tue, 21 Mar 2017 17:37:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1788012 - in /qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10: ServerConnectionDelegate.java ServerSession.java Date: Tue, 21 Mar 2017 17:37:34 -0000 To: commits@qpid.apache.org From: kwall@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170321173734.79D373A05B4@svn01-us-west.apache.org> archived-at: Tue, 21 Mar 2017 17:37:37 -0000 Author: kwall Date: Tue Mar 21 17:37:33 2017 New Revision: 1788012 URL: http://svn.apache.org/viewvc?rev=1788012&view=rev Log: QPID-7622: [0-10] Fix method ordering in ServerConnectionDelegate/ServerSession. No functional change. Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1788012&r1=1788011&r2=1788012&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Tue Mar 21 17:37:33 2017 @@ -67,6 +67,40 @@ public class ServerConnectionDelegate ex private boolean _compressionSupported; private volatile SaslNegotiator _saslNegotiator; + enum ConnectionState + { + INIT, + AWAIT_START_OK, + AWAIT_SECURE_OK, + AWAIT_TUNE_OK, + AWAIT_OPEN, + OPEN + } + + private volatile ConnectionState _state = ConnectionState.INIT; + private volatile SubjectAuthenticationResult _successfulAuthenticationResult; + + + public ServerConnectionDelegate(Broker broker, SubjectCreator subjectCreator) + { + this(createConnectionProperties(broker), Collections.singletonList((Object)"en_US"), broker, subjectCreator); + } + + private ServerConnectionDelegate(Map properties, + List locales, + Broker broker, + SubjectCreator subjectCreator) + { + _clientProperties = properties; + _mechanisms = (List) subjectCreator.getMechanisms(); + _locales = locales; + + _broker = broker; + _maxNoOfChannels = broker.getConnection_sessionCountLimit(); + _subjectCreator = subjectCreator; + _maximumFrameSize = Math.min(0xffff, broker.getNetworkBufferSize()); + } + public void control(ServerConnection conn, Method method) { method.dispatch(conn, this); @@ -119,39 +153,6 @@ public class ServerConnectionDelegate ex connection.doHeartBeat(); } - enum ConnectionState - { - INIT, - AWAIT_START_OK, - AWAIT_SECURE_OK, - AWAIT_TUNE_OK, - AWAIT_OPEN, - OPEN - } - - private volatile ConnectionState _state = ConnectionState.INIT; - private volatile SubjectAuthenticationResult _successfulAuthenticationResult; - - - public ServerConnectionDelegate(Broker broker, SubjectCreator subjectCreator) - { - this(createConnectionProperties(broker), Collections.singletonList((Object)"en_US"), broker, subjectCreator); - } - - private ServerConnectionDelegate(Map properties, - List locales, - Broker broker, - SubjectCreator subjectCreator) - { - _clientProperties = properties; - _mechanisms = (List) subjectCreator.getMechanisms(); - _locales = locales; - - _broker = broker; - _maxNoOfChannels = broker.getConnection_sessionCountLimit(); - _subjectCreator = subjectCreator; - _maximumFrameSize = Math.min(0xffff, broker.getNetworkBufferSize()); - } public final ConnectionState getState() @@ -159,7 +160,6 @@ public class ServerConnectionDelegate ex return _state; } - private void assertState(final ServerConnection conn, final ConnectionState requiredState) { if(_state != requiredState) Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1788012&r1=1788011&r2=1788012&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Tue Mar 21 17:37:33 2017 @@ -107,7 +107,6 @@ public class ServerSession extends Sessi private final AtomicBoolean _blocking = new AtomicBoolean(false); private final AtomicInteger _outstandingCredit = new AtomicInteger(UNLIMITED_CREDIT); - private final long timeout = 60000; // TODO server side close does not require this // completed incoming commands private final Object processedLock = new Object(); private final int commandLimit = Integer.getInteger("qpid.session.command_limit", 64 * 1024); @@ -145,6 +144,39 @@ public class ServerSession extends Sessi private Map> results = new HashMap>(); private org.apache.qpid.server.protocol.v0_10.transport.ExecutionException exception = null; + private final SortedMap _messageDispositionListenerMap = + new ConcurrentSkipListMap(); + + private ServerTransaction _transaction; + private final AtomicLong _txnStarts = new AtomicLong(0); + private final AtomicLong _txnCommits = new AtomicLong(0); + private final AtomicLong _txnRejects = new AtomicLong(0); + + private final AtomicLong _txnCount = new AtomicLong(0); + private Map _subscriptions = new ConcurrentHashMap(); + + private final CopyOnWriteArrayList> _consumers = new CopyOnWriteArrayList<>(); + + private AtomicReference _forcedCloseLogMessage = new AtomicReference(); + private volatile long _uncommittedMessageSize; + + private final List> _uncommittedMessages = new ArrayList<>(); + + public ServerSession(ServerConnection connection, ServerSessionDelegate delegate, Binary name, long expiry) + { + this.connection = connection; + this.delegate = delegate; + this.name = name; + this.closing = false; + this._isNoReplay = false; + initReceiver(); + _transaction = new AsyncAutoCommitTransaction(this.getMessageStore(),this); + + ServerConnection serverConnection = (ServerConnection) connection; + + _blockingTimeout = serverConnection.getBroker().getContextValue(Long.class, Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT); + } + public Binary getName() { return name; @@ -863,39 +895,6 @@ public class ServerSession extends Sessi void performAction(MessageDispositionChangeListener listener); } - private final SortedMap _messageDispositionListenerMap = - new ConcurrentSkipListMap(); - - private ServerTransaction _transaction; - private final AtomicLong _txnStarts = new AtomicLong(0); - private final AtomicLong _txnCommits = new AtomicLong(0); - private final AtomicLong _txnRejects = new AtomicLong(0); - - private final AtomicLong _txnCount = new AtomicLong(0); - private Map _subscriptions = new ConcurrentHashMap(); - - private final CopyOnWriteArrayList> _consumers = new CopyOnWriteArrayList<>(); - - private AtomicReference _forcedCloseLogMessage = new AtomicReference(); - private volatile long _uncommittedMessageSize; - - private final List> _uncommittedMessages = new ArrayList<>(); - - public ServerSession(ServerConnection connection, ServerSessionDelegate delegate, Binary name, long expiry) - { - this.connection = connection; - this.delegate = delegate; - this.name = name; - this.closing = false; - this._isNoReplay = false; - initReceiver(); - _transaction = new AsyncAutoCommitTransaction(this.getMessageStore(),this); - - ServerConnection serverConnection = (ServerConnection) connection; - - _blockingTimeout = serverConnection.getBroker().getContextValue(Long.class, Broker.CHANNEL_FLOW_CONTROL_ENFORCEMENT_TIMEOUT); - } - public Subject getSubject() { return _modelObject.getSubject(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org