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 C793E200BBB for ; Thu, 10 Nov 2016 14:16:15 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C6020160B10; Thu, 10 Nov 2016 13:16:15 +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 1A3B3160AF6 for ; Thu, 10 Nov 2016 14:16:14 +0100 (CET) Received: (qmail 88640 invoked by uid 500); 10 Nov 2016 13:16:09 -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 88628 invoked by uid 99); 10 Nov 2016 13:16:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2016 13:16:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id BF104C028B for ; Thu, 10 Nov 2016 13:16:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id AXzaY0TOaKtB for ; Thu, 10 Nov 2016 13:16:07 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 438B55F23B for ; Thu, 10 Nov 2016 13:16:07 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id A302EE7C0C for ; Thu, 10 Nov 2016 13:16:05 +0000 (UTC) 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 A0E403A17FF for ; Thu, 10 Nov 2016 13:16:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1769111 - /qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java Date: Thu, 10 Nov 2016 13:16:05 -0000 To: commits@qpid.apache.org From: lquack@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161110131605.A0E403A17FF@svn01-us-west.apache.org> archived-at: Thu, 10 Nov 2016 13:16:16 -0000 Author: lquack Date: Thu Nov 10 13:16:05 2016 New Revision: 1769111 URL: http://svn.apache.org/viewvc?rev=1769111&view=rev Log: remove unnecessary code Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java?rev=1769111&r1=1769110&r2=1769111&view=diff ============================================================================== --- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java (original) +++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java Thu Nov 10 13:16:05 2016 @@ -197,43 +197,12 @@ public abstract class AbstractConsumerTa { if(_state.compareAndSet(from, to)) { - if (to == State.ACTIVE && _stateChangeListeners.size() > 1) + if(!_stateChangeListeners.isEmpty()) { - int offset = _stateActivates.incrementAndGet(); - if (offset >= _stateChangeListeners.size()) - { - _stateActivates.set(0); - offset = 0; - } - - List> holdovers = new ArrayList<>(); - int pos = 0; for (StateChangeListener listener : _stateChangeListeners) { - if (pos++ < offset) - { - holdovers.add(listener); - } - else - { - listener.stateChanged(this, from, to); - } - } - for (StateChangeListener listener : holdovers) - { listener.stateChanged(this, from, to); } - - } - else - { - if(!_stateChangeListeners.isEmpty()) - { - for (StateChangeListener listener : _stateChangeListeners) - { - listener.stateChanged(this, from, to); - } - } } if(_suspendedConsumerLoggingTicker != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org