Merge pull request #1010 from GregDThomas/OF-891

OF-891: Ensure that the clusteringStarting/clusteringStarted flags ar…

src/java/org/jivesoftware/util/cache/CacheFactory.java

@@ -731,9 +731,11 @@ public class CacheFactory {
 
     public static void startClustering() {
         if (isClusteringAvailable()) {
-            clusteringStarting = clusteredCacheFactoryStrategy.startCluster();
+            clusteringStarting = true;
+            clusteringStarted = clusteredCacheFactoryStrategy.startCluster();
+            clusteringStarting = false;
         }
-        if (clusteringStarting) {
+        if (clusteringStarted) {
             if (statsThread == null) {
                 // Start a timing thread with 1 second of accuracy.
                 statsThread = new Thread("Cache Stats") {