felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1493322 - /felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
Date Sat, 15 Jun 2013 07:06:13 GMT
Author: clement
Date: Sat Jun 15 07:06:12 2013
New Revision: 1493322

URL: http://svn.apache.org/r1493322
Log:
Fix FELIX-4131
Explicitly set the bundle location

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

Modified: felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java?rev=1493322&r1=1493321&r2=1493322&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
(original)
+++ felix/trunk/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationTracker.java
Sat Jun 15 07:06:12 2013
@@ -265,7 +265,9 @@ public class ConfigurationTracker implem
             // 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;
             }
 



Mime
View raw message