Fixed issue #1509

orientechnologies · Jun 6, 2013 · ad6f1d8 · ad6f1d8
1 parent cb420fd
commit ad6f1d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...ributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastPlugin.java b/...ributed/src/main/java/com/orientechnologies/orient/server/hazelcast/OHazelcastPlugin.java
@@ -361,7 +361,6 @@ public String getMasterNode(final String iDatabaseName, final String iClusterNam
               this,
               "DISTRIBUTED found wrong configuration for database '%s': cannot find the 'master' field for the cluster '%s'. '$auto' will be used",
               iDatabaseName, iClusterName);
-      masterNode = "$auto";
     } else if (!masterNode.equalsIgnoreCase("$auto"))
       return masterNode;
 

diff --git a/...er/src/main/java/com/orientechnologies/orient/server/task/OSQLCommandDistributedTask.java b/...er/src/main/java/com/orientechnologies/orient/server/task/OSQLCommandDistributedTask.java
@@ -63,7 +63,7 @@ public Object call() throws Exception {
     ODistributedThreadLocal.INSTANCE.distributedExecution = true;
     try {
 
-      Object result = openDatabase().command(new OCommandSQL(text));
+      Object result = openDatabase().command(new OCommandSQL(text)).execute();
 
       if (mode != EXECUTION_MODE.FIRE_AND_FORGET)
         return result;