Merged V4.1-BUG-FIX to HEAD

42774: ALF-16367: MT fix for "Exporting a tenant from one instance A and importing it to another Alfresco instance B does not work"
   42775: Merged DEV to V4.1-BUG-FIX
      42274: First part of ALF-14341: WQS: SOLR Request failed wit error 500: DTENANT_FILTER_FROM_JSON
             WQS jobs don't execute if repository is in the bootstrapping state.
             RepositoryState class was made thread safe. 
   42781: ALF-15135: Apple Mail always fails when copying folders with nested folders
   - Because FileFolderService.resolveNamePath was not properly honouring mustExist==false for parent folders
   42798: ALF-16384 - checkLicenseForSyncMode exposed via properties files
      code comments changed.
   42799: ALF-16384 - checkLicenseForSyncMode exposed via properties files    properties comments changed.
   42801: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_17 to BRANCHES/DEV/V4.1-BUG-FIX:
      42748: ALF-14200: Adding Invalid Aspects Via CMIS ATOM API Results in NullPointerException
   42802: Fix failing NodeServiceTest
   - Moved parentless node validation to correct location to avoid NPEs in indexing
   - Fixed unit test to temporarily disable indexing in order to be able to create a corrupt parentless node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/admin/RepositoryState.java

@@ -18,6 +18,8 @@
  */
 package org.alfresco.repo.admin;
 
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 /**
  * @author Andy
  *
@@ -25,16 +27,32 @@ package org.alfresco.repo.admin;
 public class RepositoryState
 {
     private boolean bootstrapping;
+    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
     public boolean isBootstrapping()
     {
-        return bootstrapping;
+        this.lock.readLock().lock();
+        try
+        {
+            return bootstrapping;
+        }
+        finally
+        {
+            this.lock.readLock().unlock();
+        }
     }
 
     public void setBootstrapping(boolean bootstrapping)
     {
-        this.bootstrapping = bootstrapping;
+        this.lock.writeLock().lock();
+        try
+        {
+            this.bootstrapping = bootstrapping;
+        }
+        finally
+        {
+            this.lock.writeLock().unlock();
+        }
     }
     
-    
 }