X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2Fpicking%2FSocketManager.java;h=bc9dd59a8455fbecf1580384f6c94055c5f29288;hb=f5306591821b5f6d4e381ff30b647bd149d51f43;hp=ad12a71babdab54d0d107de39f991598faa5103e;hpb=f900bd84927e08acb2c47527da9cc4efe3a2b968;p=vamsas.git

diff --git a/src/uk/ac/vamsas/client/picking/SocketManager.java b/src/uk/ac/vamsas/client/picking/SocketManager.java
index ad12a71..bc9dd59 100644
--- a/src/uk/ac/vamsas/client/picking/SocketManager.java
+++ b/src/uk/ac/vamsas/client/picking/SocketManager.java
@@ -35,7 +35,7 @@ public class SocketManager implements IPickManager
 	 */
 	public SocketManager()
 	{
-//		logger.setLevel(Level.OFF);
+	//logger.setLevel(Level.OFF);
 		
 		server = new PickServer(this);
 		clients = new LinkedList();
@@ -149,15 +149,15 @@ public class SocketManager implements IPickManager
 	{
 		public void run()
 		{
-			logger.info("Initializing connection...");
+			logger.debug("Initializing connection...");
 			boolean connected = false;
 			
 			// Loop until we can get a connection (one way or the other)
-			while (!connected)
+			while (!connected && isRunning)
 			{
 				// Sleep for a rnd time so we don't end up with all the VAMSAS
 				// apps trying to initialize servers at the same time
-				try { Thread.sleep((int)Math.random()); }
+				try { Thread.sleep((int)(10*Math.random())); }
 				catch (InterruptedException e) {}
 					
 				// Attempt to open the server port...
@@ -168,20 +168,25 @@ public class SocketManager implements IPickManager
 				else if (addEndPoint(null))
 					connected = true;
 			}
+      logger.debug("Completed initializing connection.");
 		}
 	}
 	
 	public void shutdown()
 	{
-		if (server == null)
+		logger.debug("Shutting down socket manager.");
+    if (server == null)
 			throw new Error("Client Implementation Error: shutdown() called on uninitialized SocketManager.");
 		
 		isRunning = false;
 		
 		if (server.isServer())
 			server.terminate();
-
-		while (clients.size() > 0)
-			((PickEndPoint)clients.getFirst()).terminate();
-	}
+		
+		while (clients.size() > 0) {
+			logger.debug("Closing endpoint.");
+      ((PickEndPoint)clients.getFirst()).terminate();
+		}
+    logger.debug("Shutdown of socketmanager completed.");
+  }
 }
\ No newline at end of file