Index: trunk/src/main/java/omq/common/broker/Broker.java
===================================================================
--- trunk/src/main/java/omq/common/broker/Broker.java	(revision 98)
+++ trunk/src/main/java/omq/common/broker/Broker.java	(revision 112)
@@ -3,5 +3,4 @@
 import java.io.IOException;
 import java.lang.reflect.Proxy;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -22,10 +21,9 @@
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
-
+
+import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;
-import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.QueueingConsumer.Delivery;
 import com.rabbitmq.client.ShutdownListener;
@@ -56,6 +54,6 @@
 	public Broker(Properties env) throws Exception {
 		// Load log4j configuration
-		URL log4jResource = Broker.class.getResource("/log4j.xml");
-		DOMConfigurator.configure(log4jResource);
+		// URL log4jResource = Broker.class.getResource("/log4j.xml");
+		// DOMConfigurator.configure(log4jResource);
 
 		remoteObjs = new HashMap<String, RemoteObject>();
@@ -65,11 +63,18 @@
 		channel = connection.createChannel();
 		addFaultTolerance();
-		try {
-			tryConnection(env);
-		} catch (Exception e) {
-			channel.close();
-			connection.close();
+		if (!connection.isOpen() || !channel.isOpen()) {
+			if (connection.isOpen()) {
+				connection.close();
+			}
 			throw new InitBrokerException("The connection didn't work");
 		}
+
+		// try {
+		// tryConnection(env);
+		// } catch (Exception e) {
+		// channel.close();
+		// connection.close();
+		// throw new InitBrokerException("The connection didn't work");
+		// }
 	}
 
@@ -95,5 +100,5 @@
 
 		clientStarted = false;
-		connectionClosed = false;
+		// connectionClosed = false;
 		environment = null;
 		remoteObjs = null;
@@ -117,5 +122,5 @@
 		connectionClosed = true;
 		connection.close();
-		connectionClosed = false;
+		// connectionClosed = false;
 	}