commit d74358bc7fb37d97126931bfc88a2a52ac0783d0
author David Morgan Spencer Savage <dsavage@apache.org> Mon Mar 01 11:54:52 2010 +0000
committer David Morgan Spencer Savage <dsavage@apache.org> Mon Mar 01 11:54:52 2010 +0000
tree 3ca0096c897b4c45a331baaede2d4e2d8a23a14e
parent 16391aca6758ef7fb879405f1c53d1f1a42b0d13

Check for "system bundle" vs null after change made in FELIX-2133

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

sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java

diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
index a215202..52701e7 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
@@ -69,19 +69,22 @@
 
 
     // used by ProjectRepository
-    static DelegateParser instance()
+    static synchronized DelegateParser instance()
     {
         if ( instance == null )
             throw new IllegalStateException( "SigilParser is not instantiated." );
+        
         return instance;
     }
 
 
     public SigilParser()
     {
-        if ( instance == null )
-        {
-            instance = new DelegateParser();
+        synchronized(SigilParser.class) {
+            if ( instance == null )
+            {
+                instance = new DelegateParser();
+            }
         }
     }
 
@@ -530,7 +533,7 @@
                 IBundleModelElement info = bundle.getBundleInfo();
                 String name = info.getSymbolicName();
 
-                if ( name == null )
+                if ( "system bundle".equals(name) )
                 {
                     // e.g. SystemProvider with framework=null
                     Log.verbose( "Discarding system bundle" );