Return-Path: <commits-return-42257-archive-asf-public=cust-asf.ponee.io@activemq.apache.org>
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 6301A200B85
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 31 Aug 2016 20:48:41 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 6159B160AA7; Wed, 31 Aug 2016 18:48:41 +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 87468160AB4
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 31 Aug 2016 20:48:40 +0200 (CEST)
Received: (qmail 43318 invoked by uid 500); 31 Aug 2016 18:48:39 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 43298 invoked by uid 99); 31 Aug 2016 18:48:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2016 18:48:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 91B85E0902; Wed, 31 Aug 2016 18:48:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: clebertsuconic@apache.org
To: commits@activemq.apache.org
Date: Wed, 31 Aug 2016 18:48:40 -0000
Message-Id: <da4a79d98d9d4790a21ced15bb4c0814@git.apache.org>
In-Reply-To: <8ab002f6328d42ceac50660804c8762f@git.apache.org>
References: <8ab002f6328d42ceac50660804c8762f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] activemq-artemis git commit: ARTEMIS-710 Avoid inefficient
 iteration over Map
archived-at: Wed, 31 Aug 2016 18:48:41 -0000

ARTEMIS-710 Avoid inefficient iteration over Map


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/275924e8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/275924e8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/275924e8

Branch: refs/heads/master
Commit: 275924e8f4718ac07715eee464db4438099d63bb
Parents: 93b3cab
Author: Martin Styk <mstyk@redhat.com>
Authored: Wed Aug 31 16:36:09 2016 +0200
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Aug 31 14:48:31 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/server/impl/PostOfficeJournalLoader.java    | 8 ++++----
 .../activemq/artemis/core/server/impl/ScaleDownHandler.java  | 6 +++---
 .../apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/275924e8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 2ced2d8..0645dca 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -321,9 +321,9 @@ public class PostOfficeJournalLoader implements JournalLoader {
 
       Map<SimpleString, Map<Long, Map<Long, List<PageCountPending>>>> perAddressMap = generateMapsOnPendingCount(queues, pendingNonTXPageCounter, txRecoverCounter);
 
-      for (SimpleString address : perAddressMap.keySet()) {
-         PagingStore store = pagingManager.getPageStore(address);
-         Map<Long, Map<Long, List<PageCountPending>>> perPageMap = perAddressMap.get(address);
+      for (Map.Entry<SimpleString, Map<Long, Map<Long, List<PageCountPending>>>> addressPageMapEntry : perAddressMap.entrySet()) {
+         PagingStore store = pagingManager.getPageStore(addressPageMapEntry.getKey());
+         Map<Long, Map<Long, List<PageCountPending>>> perPageMap = addressPageMapEntry.getValue();
 
          // We have already generated this before, so it can't be null
          assert (perPageMap != null);
@@ -376,7 +376,7 @@ public class PostOfficeJournalLoader implements JournalLoader {
             }
             else {
                // on this case the page file didn't exist, we just remove all the records since the page is already gone
-               logger.debug("Page " + pageId + " didn't exist on address " + address + ", so we are just removing records");
+               logger.debug("Page " + pageId + " didn't exist on address " + addressPageMapEntry.getKey() + ", so we are just removing records");
                for (List<PageCountPending> records : perQueue.values()) {
                   for (PageCountPending record : records) {
                      logger.debug("Removing pending page counter " + record.getID());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/275924e8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
index 41b7bd1..c6d3f70 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
@@ -409,15 +409,15 @@ public class ScaleDownHandler {
       try (ClientSession session = sessionFactory.createSession(user, password, true, false, false, false, 0);
            ClientProducer producer = session.createProducer(managementAddress)) {
          //todo - https://issues.jboss.org/browse/HORNETQ-1336
-         for (SimpleString address : duplicateIDMap.keySet()) {
+         for (Map.Entry<SimpleString,List<Pair<byte[], Long>>> entry : duplicateIDMap.entrySet()) {
             ClientMessage message = session.createMessage(false);
-            List<Pair<byte[], Long>> list = duplicateIDMap.get(address);
+            List<Pair<byte[], Long>> list = entry.getValue();
             String[] array = new String[list.size()];
             for (int i = 0; i < list.size(); i++) {
                Pair<byte[], Long> pair = list.get(i);
                array[i] = new String(pair.getA());
             }
-            ManagementHelper.putOperationInvocation(message, ResourceNames.CORE_SERVER, "updateDuplicateIdCache", address.toString(), array);
+            ManagementHelper.putOperationInvocation(message, ResourceNames.CORE_SERVER, "updateDuplicateIdCache", entry.getKey().toString(), array);
             producer.send(message);
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/275924e8/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 761af7d..8cfc31b 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -298,8 +298,9 @@ public abstract class ActiveMQTestBase extends Assert {
             fail("Client Session Factories still trying to reconnect, see above to see where created");
          }
          Map<Thread, StackTraceElement[]> threadMap = Thread.getAllStackTraces();
-         for (Thread thread : threadMap.keySet()) {
-            StackTraceElement[] stack = threadMap.get(thread);
+         for (Map.Entry<Thread, StackTraceElement[]> entry : threadMap.entrySet()) {
+            Thread thread = entry.getKey();
+            StackTraceElement[] stack = entry.getValue();
             for (StackTraceElement stackTraceElement : stack) {
                if (stackTraceElement.getMethodName().contains("getConnectionWithRetry") && !alreadyFailedThread.contains(thread)) {
                   alreadyFailedThread.add(thread);