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 2010/04/12 00:23:02 UTC

svn commit: r933002 - /felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java

Author: pauls
Date: Sun Apr 11 22:23:01 2010
New Revision: 933002

URL: http://svn.apache.org/viewvc?rev=933002&view=rev
Log:
Fix FELIX-2087.

Modified:
    felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java

Modified: felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java
URL: http://svn.apache.org/viewvc/felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java?rev=933002&r1=933001&r2=933002&view=diff
==============================================================================
--- felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java (original)
+++ felix/branches/org.apache.felix.framework-2.0.5-RC/src/main/java/org/apache/felix/framework/FelixResolverState.java Sun Apr 11 22:23:01 2010
@@ -391,7 +391,7 @@ public class FelixResolverState implemen
         // Create a list of all matching hosts for this fragment.
         List matchingHosts = new ArrayList();
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
+        if ((sm != null) && (fragment.getSymbolicName() != null))
         {
             if (!((BundleProtectionDomain) fragment.getSecurityContext()).impliesDirect(new BundlePermission(
                 fragment.getSymbolicName(), BundlePermission.FRAGMENT)))
@@ -421,7 +421,7 @@ public class FelixResolverState implemen
                 continue;
             }
             
-            if (sm != null)
+            if ((sm != null) && (host.getSymbolicName() != null))
             {
                 if (!((BundleProtectionDomain) host.getSecurityContext()).impliesDirect(new BundlePermission(host.getSymbolicName(), 
                     BundlePermission.HOST)))
@@ -805,7 +805,7 @@ public class FelixResolverState implemen
         // find ones that match.
         List fragmentList = new ArrayList();
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
+        if ((sm != null) && (host.getSymbolicName() != null))
         {
             if (!((BundleProtectionDomain) host.getSecurityContext()).impliesDirect(new BundlePermission(host.getSymbolicName(), BundlePermission.HOST)))
             {
@@ -832,7 +832,7 @@ public class FelixResolverState implemen
                 continue;
             }
             
-            if (sm != null)
+            if ((sm != null) && (fragment.getSymbolicName() != null))
             {
                 if (!((BundleProtectionDomain) fragment.getSecurityContext()).impliesDirect(new BundlePermission(fragment.getSymbolicName(), BundlePermission.FRAGMENT)))
                 {