Index: /trunk/src/main/java/omq/common/broker/Broker.java
===================================================================
--- /trunk/src/main/java/omq/common/broker/Broker.java	(revision 111)
+++ /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;
 	}
 
Index: unk/target/classes/log4j.xml
===================================================================
--- /trunk/target/classes/log4j.xml	(revision 111)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <param name="Threshold" value="INFO" />
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" />
-        </layout>
-    </appender>
-
-    <appender class="org.apache.log4j.rolling.RollingFileAppender" name="A2">
-        <param value="true" name="append"/>
-        <param value="logs/objectmq-temp.log" name="File"/>
-
-        <rollingPolicy class="org.apache.log4j.rolling.FixedWindowRollingPolicy">
-            <param name="fileNamePattern" value="logs/objectmq-%i.log" />
-            <param name="MinIndex" value="0"/> 
-            <param name="MaxIndex" value="1"/> 
-        </rollingPolicy>
-        
-        <triggeringPolicy class="org.apache.log4j.rolling.SizeBasedTriggeringPolicy"> 
-            <param name="MaxFileSize" value="10000000"/> 
-        </triggeringPolicy> 
-        
-        <layout class="org.apache.log4j.PatternLayout">
-            <param value="%d{[yyyy-MM-dd HH:mm:ss]} %-5p %c:%L - %m%n" name="ConversionPattern"/>
-        </layout>        
-    </appender>
-
-  <root> 
-    <priority value ="INFO" /> 
-    <appender-ref ref="consoleAppender" />
-    <appender-ref ref="A2" />  
-  </root>
-  
-</log4j:configuration>
Index: /trunk/target/maven-archiver/pom.properties
===================================================================
--- /trunk/target/maven-archiver/pom.properties	(revision 111)
+++ /trunk/target/maven-archiver/pom.properties	(revision 112)
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Jul 08 16:29:44 CEST 2013
-version=0.5.5
+#Tue Dec 17 11:35:36 CET 2013
+version=0.5.6
 groupId=objectmq
 artifactId=objectmq
Index: /trunk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
===================================================================
--- /trunk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst	(revision 111)
+++ /trunk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst	(revision 112)
@@ -11,4 +11,5 @@
 omq/test/event/MessageTest.class
 omq/test/multiProcess/NumberClient.class
+omq/test/multiThread/ThreadTest$1.class
 omq/test/python/Server.class
 omq/test/stopBroker/StopBrokerTest.class
@@ -19,7 +20,9 @@
 omq/test/event/MessageImpl.class
 omq/test/event/Message.class
+omq/test/multiThread/RemoteMulti.class
 omq/test/stopBroker/UnbindTest.class
 omq/test/stopBroker/BrokerKillerImpl$1.class
 omq/test/exception/ServerInterface.class
+omq/test/multiThread/ThreadTest.class
 omq/test/workspace/WorkspaceTest.class
 omq/test/observer/RemoteSubject.class
@@ -32,4 +35,5 @@
 omq/test/persistence/Message.class
 omq/test/exception/ExceptionTest.class
+omq/test/multiThread/ZeroThread.class
 omq/test/workspace/RemoteWorkspace.class
 omq/test/multiProcess/NumberImpl.class
@@ -41,3 +45,4 @@
 omq/test/calculator/Calculator.class
 omq/test/exception/Trailer.class
+omq/test/multiThread/MultiInterface.class
 omq/test/observer/RemoteSubjectImpl.class