From e75f6461b2d3a9d2bc51e874372ca5af8929ffea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PK=20S=C3=B8reide?= <per.kristian.soreide@gmail.com>
Date: Fri, 1 Apr 2016 15:55:24 +0200
Subject: [PATCH] Fixes FELIX-5231 - Order Repositories in the order they are
 added

---
 .../felix/bundlerepository/impl/RepositoryAdminImpl.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryAdminImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryAdminImpl.java
index 0237aa465ef..13d2e04acfa 100644
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryAdminImpl.java
+++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RepositoryAdminImpl.java
@@ -26,15 +26,16 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.apache.felix.bundlerepository.Capability;
 import org.apache.felix.bundlerepository.DataModelHelper;
-import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Repository;
+import org.apache.felix.bundlerepository.RepositoryAdmin;
+import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Resolver;
 import org.apache.felix.bundlerepository.Resource;
 import org.apache.felix.utils.collections.MapToDictionary;
@@ -42,8 +43,6 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
-import org.apache.felix.bundlerepository.Repository;
-import org.apache.felix.bundlerepository.RepositoryAdmin;
 
 public class RepositoryAdminImpl implements RepositoryAdmin
 {
@@ -52,7 +51,7 @@ public class RepositoryAdminImpl implements RepositoryAdmin
     private final SystemRepositoryImpl m_system;
     private final LocalRepositoryImpl m_local;
     private final DataModelHelper m_helper = new DataModelHelperImpl();
-    private Map m_repoMap = new HashMap();
+    private Map m_repoMap = new LinkedHashMap();
     private boolean m_initialized = false;
 
     // Reusable comparator for sorting resources by name.