You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/08/04 23:10:23 UTC
svn commit: r1154015 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework:
BundleWiringImpl.java Felix.java StatefulResolver.java
resolver/ResolverImpl.java
Author: rickhall
Date: Thu Aug 4 21:10:22 2011
New Revision: 1154015
URL: http://svn.apache.org/viewvc?rev=1154015&view=rev
Log:
Use singleton maps. (FELIX-2950)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java?rev=1154015&r1=1154014&r2=1154015&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleWiringImpl.java Thu Aug 4 21:10:22 2011
@@ -2494,8 +2494,8 @@ public class BundleWiringImpl implements
{
// Try to see if there is an exporter available.
Map<String, String> dirs = Collections.EMPTY_MAP;
- Map<String, Object> attrs = new HashMap<String, Object>(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ Map<String, Object> attrs = Collections.singletonMap(
+ BundleRevision.PACKAGE_NAMESPACE, (Object) pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
revision, BundleRevision.PACKAGE_NAMESPACE, dirs, attrs);
Set<BundleCapability> exporters = resolver.getCandidates(req, false);
@@ -2533,8 +2533,8 @@ public class BundleWiringImpl implements
// Next, check to see if there are any exporters for the package at all.
Map<String, String> dirs = Collections.EMPTY_MAP;
- Map<String, Object> attrs = new HashMap<String, Object>(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ Map<String, Object> attrs = Collections.singletonMap(
+ BundleRevision.PACKAGE_NAMESPACE, (Object) pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
revision, BundleRevision.PACKAGE_NAMESPACE, dirs, attrs);
Set<BundleCapability> exports = resolver.getCandidates(req, false);
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1154015&r1=1154014&r2=1154015&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Thu Aug 4 21:10:22 2011
@@ -3578,8 +3578,8 @@ public class Felix extends BundleImpl im
ExportedPackage[] getExportedPackages(String pkgName)
{
// First, get all exporters of the package.
- Map<String, Object> attrs = new HashMap<String, Object>(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ Map<String, Object> attrs = Collections.singletonMap(
+ BundleRevision.PACKAGE_NAMESPACE, (Object) pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
null,
BundleRevision.PACKAGE_NAMESPACE,
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java?rev=1154015&r1=1154014&r2=1154015&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java Thu Aug 4 21:10:22 2011
@@ -722,8 +722,8 @@ class StatefulResolver
// Loop through the importer's dynamic requirements to determine if
// there is a matching one for the package from which we want to
// load a class.
- Map<String, Object> attrs = new HashMap(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ Map<String, Object> attrs = Collections.singletonMap(
+ BundleRevision.PACKAGE_NAMESPACE, (Object) pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
revision,
BundleRevision.PACKAGE_NAMESPACE,
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=1154015&r1=1154014&r2=1154015&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Thu Aug 4 21:10:22 2011
@@ -554,8 +554,8 @@ public class ResolverImpl implements Res
}
// Determine if any providers of the package exist.
- Map<String, Object> attrs = new HashMap(1);
- attrs.put(BundleRevision.PACKAGE_NAMESPACE, pkgName);
+ Map<String, Object> attrs = Collections.singletonMap(
+ BundleRevision.PACKAGE_NAMESPACE, (Object) pkgName);
BundleRequirementImpl req = new BundleRequirementImpl(
revision,
BundleRevision.PACKAGE_NAMESPACE,