You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2018/03/13 08:07:17 UTC
svn commit: r1826609 - in
/felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework:
BundleRevisionImpl.java BundleWiringImpl.java Felix.java
Author: pauls
Date: Tue Mar 13 08:07:16 2018
New Revision: 1826609
URL: http://svn.apache.org/viewvc?rev=1826609&view=rev
Log:
FELIX-5804: Improve framework lookup for bundle protocol urls
Modified:
felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/Felix.java
Modified: felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java?rev=1826609&r1=1826608&r2=1826609&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java (original)
+++ felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleRevisionImpl.java Tue Mar 13 08:07:16 2018
@@ -636,7 +636,7 @@ public class BundleRevisionImpl implemen
{
return m_secureAction.createURL(null,
FelixConstants.BUNDLE_URL_PROTOCOL + "://" +
- m_id + ":" + port + path,
+ m_bundle.getFramework()._getProperty(Constants.FRAMEWORK_UUID) + "_" + m_id + ":" + port + path,
getBundle().getFramework().getBundleStreamHandler());
}
catch (MalformedURLException ex)
Modified: felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1826609&r1=1826608&r2=1826609&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Tue Mar 13 08:07:16 2018
@@ -1094,8 +1094,8 @@ public class BundleWiringImpl implements
{
return BundleRevisionImpl.getSecureAction().createURL(null,
FelixConstants.BUNDLE_URL_PROTOCOL + "://" +
- m_revision.getId() + ":" + port + path,
- getBundle().getFramework().getBundleStreamHandler());
+ getBundle().getFramework()._getProperty(Constants.FRAMEWORK_UUID) + "_" + m_revision.getId() + ":" + port + path,
+ getBundle().getFramework().getBundleStreamHandler());
}
catch (MalformedURLException ex)
{
Modified: felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1826609&r1=1826608&r2=1826609&view=diff
==============================================================================
--- felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/osgi-r7/framework/src/main/java/org/apache/felix/framework/Felix.java Tue Mar 13 08:07:16 2018
@@ -2936,6 +2936,14 @@ public class Felix extends BundleImpl im
return !(val instanceof String) ? System.getProperty(key) : (String) val;
}
+ String _getProperty(String key)
+ {
+ // First, check the config properties.
+ Object val = m_configMap.get(key);
+ // If not found, then try the system properties.
+ return !(val instanceof String) ? m_secureAction.getSystemProperty(key, null) : (String) val;
+ }
+
private Bundle reloadBundle(BundleArchive ba)
throws BundleException
{