Distributed: Fixed issue on restart node

lvca · lvca · commit e6a40ec1f13f · 2014-05-21T18:29:35.000+02:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OLocalPaginatedStorage.java b/core/src/main/java/com/orientechnologies/orient/core/storage/impl/local/paginated/OLocalPaginatedStorage.java
@@ -23,7 +23,6 @@
 import com.orientechnologies.common.io.OIOUtils;
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.common.parser.OSystemVariableResolver;
-import com.orientechnologies.common.util.OArrays;
 import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.command.OCommandOutputListener;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
@@ -81,11 +80,18 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Andrey Lomakin
@@ -1739,7 +1745,7 @@ public int compare(ODirtyPage pageOne, ODirtyPage pageTwo) {
   }
 
   private void restoreFromBegging() throws IOException {
-    OLogManager.instance().info(this, "Date restore procedure is started.");
+    OLogManager.instance().info(this, "Data restore procedure is started.");
     OLogSequenceNumber lsn = writeAheadLog.begin();
 
     restoreFrom(lsn);
diff --git a/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedConfiguration.java b/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedConfiguration.java
@@ -343,10 +343,16 @@ public ODocument getClusterConfiguration(String iClusterName) {
       if (iClusterName == null)
         iClusterName = "*";
 
-      ODocument cfg = clusters.field(iClusterName);
-      if (cfg == null && !iClusterName.equals("*"))
-        // GET DEFAULT CLUSTER
+      final ODocument cfg;
+      if (!clusters.containsField(iClusterName))
+        // NO CLUSTER IN CFG: GET THE DEFAULT ONE
         cfg = clusters.field("*");
+      else
+        // GET THE CLUSTER CFG
+        cfg = clusters.field(iClusterName);
+
+      if( cfg == null )
+        return new ODocument();
 
       return cfg;
     }
