Connection issues in server admin were fixed.

andrii0lomakin · andrii0lomakin · commit 160b65bcbcaf · 2014-02-05T19:32:18.000+02:00
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OServerAdmin.java
@@ -54,7 +54,7 @@ public OServerAdmin(String iURL) throws IOException {
     if (!iURL.contains("/"))
       iURL += "/";
 
-    storage = new OStorageRemote(null, iURL, "");
+    storage = new OStorageRemote(null, iURL, "", OStorage.STATUS.OPEN);
   }
 
   /**
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java
@@ -137,20 +137,27 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy, O
   private final int                              maxReadQueue;
 
   public OStorageRemote(final String iClientId, final String iURL, final String iMode) throws IOException {
-    super(iURL, iURL, iMode, 0, new OCacheLevelTwoLocatorRemote()); // NO TIMEOUT @SINCE 1.5
-    clientId = iClientId;
-    configuration = null;
+    this(iClientId, iURL, iMode, null);
+  }
 
-    clientConfiguration = new OContextConfiguration();
-    connectionRetry = clientConfiguration.getValueAsInteger(OGlobalConfiguration.NETWORK_SOCKET_RETRY);
-    connectionRetryDelay = clientConfiguration.getValueAsInteger(OGlobalConfiguration.NETWORK_SOCKET_RETRY_DELAY);
-    asynchEventListener = new OStorageRemoteAsynchEventListener(this);
-    parseServerURLs();
+	public OStorageRemote(final String iClientId, final String iURL, final String iMode, STATUS status) throws IOException {
+		super(iURL, iURL, iMode, 0, new OCacheLevelTwoLocatorRemote()); // NO TIMEOUT @SINCE 1.5
+		if (status != null)
+			this.status = status;
 
-    asynchExecutor = Executors.newSingleThreadScheduledExecutor();
+		clientId = iClientId;
+		configuration = null;
 
-    maxReadQueue = Runtime.getRuntime().availableProcessors() - 1;
-  }
+		clientConfiguration = new OContextConfiguration();
+		connectionRetry = clientConfiguration.getValueAsInteger(OGlobalConfiguration.NETWORK_SOCKET_RETRY);
+		connectionRetryDelay = clientConfiguration.getValueAsInteger(OGlobalConfiguration.NETWORK_SOCKET_RETRY_DELAY);
+		asynchEventListener = new OStorageRemoteAsynchEventListener(this);
+		parseServerURLs();
+
+		asynchExecutor = Executors.newSingleThreadScheduledExecutor();
+
+		maxReadQueue = Runtime.getRuntime().availableProcessors() - 1;
+	}
 
   public int getSessionId() {
     return OStorageRemoteThreadLocal.INSTANCE.get().sessionId.intValue();

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public OServerAdmin(String iURL) throws IOException {`
`54`	`54`	`if (!iURL.contains("/"))`
`55`	`55`	`iURL += "/";`
`56`	`56`
`57`		`- storage = new OStorageRemote(null, iURL, "");`
	`57`	`+ storage = new OStorageRemote(null, iURL, "", OStorage.STATUS.OPEN);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`