svn commit: r985650 - /sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java

[cziegeler]

Author: cziegeler
Date: Sun Aug 15 10:26:13 2010
New Revision: 985650

URL: http://svn.apache.org/viewvc?rev=985650&view=rev
Log:
Don't delete sling id file in engine for compatibility and add a temporary np 
check

Modified:
    
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java

Modified: 
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java?rev=985650&r1=985649&r2=985650&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
 Sun Aug 15 10:26:13 2010
@@ -101,12 +101,11 @@ public class SlingSettingsServiceImpl
         // if we don't have an id yet, we look for the engine bundle for 
compatibility reasons
         if ( this.slingId == null ) {
             final Bundle engineBundle = this.searchEngineBundle(context);
-            if ( engineBundle != null ) {
+            // TODO - we need the bundle context, maybe we should wait for the 
engine bundle to become active?
+            if ( engineBundle != null && engineBundle.getBundleContext() != 
null ) {
                 final File engineIdFile = 
engineBundle.getBundleContext().getDataFile(DATA_FILE);
                 this.slingId = this.readSlingId(engineIdFile);
                 if ( this.slingId != null ) {
-                    // delete the old file
-                    engineIdFile.delete();
                     this.writeSlingId(idFile, this.slingId);
                 }
             }