commit cbe97668eeefbb9b1b2930f5e4a87b72bff01928
author Clement Escoffier <clement@apache.org> Sat Jun 15 07:06:12 2013 +0000
committer Clement Escoffier <clement@apache.org> Sat Jun 15 07:06:12 2013 +0000
tree 8f2198675f33618e61499d16734fba1c9dbe87a6
parent d4f680878bdc5ec61c318e24ec24fea8a34dbfe4

Fix FELIX-4131
Explicitly set the bundle location

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1493322 13f79535-47bb-0310-9956-ffa450edef68

ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java

diff --git a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
index 7e61fb1..04fd592 100644
--- a/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
+++ b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
@@ -265,7 +265,9 @@
             // configuration exists but can't be managed by iPOJO.
             final Configuration cfg = admin.getConfiguration(pid);
             final String bundleLocation = bundle.getLocation();
-            if (cfg.getBundleLocation() == null || bundleLocation.equals(cfg.getBundleLocation())) {
+            if (cfg.getBundleLocation() == null || bundleLocation.equals(cfg.getBundleLocation())
+                    || m_context.getBundle().getLocation().equals(cfg.getBundleLocation())) {
+                cfg.setBundleLocation(bundleLocation);
                 return cfg;
             }