From 482de5503c4920f552764f5a61704ac644b72394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= <apupier@redhat.com>
Date: Tue, 5 Sep 2017 16:59:54 +0200
Subject: [PATCH] EntrySet should be iterated when both the key and value are
 needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
---
 .../karaf/bundle/command/ShowBundleTree.java      | 15 ++++++++-------
 .../apache/karaf/config/command/ListCommand.java  |  7 +++----
 .../features/internal/region/DigraphHelper.java   |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
index 792c9dc2fe0..98bdc871e91 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/ShowBundleTree.java
@@ -139,15 +139,16 @@ private void printDuplicatePackages(Tree<Bundle> tree) {
                 }
             }
         }
-
-        for (String pkg : exports.keySet()) {
-            if (exports.get(pkg).size() > 1) {
-                System.out.printf("%n");
-                System.out.printf("WARNING: multiple bundles are exporting package %s%n", pkg);
-                for (Bundle bundle : exports.get(pkg)) {
+        
+        for(Map.Entry<String, Set<Bundle>> entry : exports.entrySet()) {
+        	Set<Bundle> bundlesExportingPkg = entry.getValue();
+        	if(bundlesExportingPkg.size() > 1) {
+        		System.out.printf("%n");
+                System.out.printf("WARNING: multiple bundles are exporting package %s%n", entry.getKey());
+                for (Bundle bundle : bundlesExportingPkg) {
                     System.out.printf("- %s%n", bundle);
                 }
-            }
+        	}
         }
     }
 
diff --git a/config/src/main/java/org/apache/karaf/config/command/ListCommand.java b/config/src/main/java/org/apache/karaf/config/command/ListCommand.java
index b4df5c63dcb..dc041c9ba88 100644
--- a/config/src/main/java/org/apache/karaf/config/command/ListCommand.java
+++ b/config/src/main/java/org/apache/karaf/config/command/ListCommand.java
@@ -41,8 +41,7 @@ protected Object doExecute() throws Exception {
             for (Configuration config : configs) {
                 sortedConfigs.put(config.getPid(), config);
             }
-            for (String pid : sortedConfigs.keySet()) {
-                Configuration config = sortedConfigs.get(pid);
+            for (Configuration config : sortedConfigs.values()) {
                 System.out.println("----------------------------------------------------------------");
                 System.out.println("Pid:            " + config.getPid());
                 if (config.getFactoryPid() != null) {
@@ -57,8 +56,8 @@ protected Object doExecute() throws Exception {
                         Object key = e.nextElement();
                         sortedProps.put(key.toString(), props.get(key));
                     }
-                    for (String key : sortedProps.keySet()) {
-                        System.out.println("   " + key + " = " + displayValue(sortedProps.get(key)));
+                    for (Map.Entry<String, Object> entry : sortedProps.entrySet()) {
+                        System.out.println("   " + entry.getKey() + " = " + displayValue(entry.getValue()));
                     }
                 }
             }
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/DigraphHelper.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/DigraphHelper.java
index 31056b4a195..944fe6fbf07 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/DigraphHelper.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/DigraphHelper.java
@@ -180,10 +180,10 @@ public static Map<String, Map<String, Map<String, Set<String>>>> getPolicies(Reg
             for (RegionDigraph.FilteredRegion fr : digraph.getEdges(region)) {
                 Map<String, Set<String>> policy = new HashMap<>();
                 Map<String, Collection<String>> current = fr.getFilter().getSharingPolicy();
-                for (String ns : current.keySet()) {
-                    for (String f : current.get(ns)) {
-                        addToMapSet(policy, ns, f);
-                    }
+                for (Map.Entry<String, Collection<String>> entry : current.entrySet()) {
+                	for(String f : entry.getValue()) {
+                		 addToMapSet(policy, entry.getKey(), f);
+                	}
                 }
                 edges.put(fr.getRegion().getName(), policy);
             }