Changeset 112

Timestamp:

04/04/14 13:09:57 (11 years ago)

Author:

stoda

Message:

Tryconnection function mades no sense and does not work as expected

Location:

trunk

Files:

• src/main/java/omq/common/broker/Broker.java (modified) (6 diffs)
• target/classes/log4j.xml (deleted)
• target/maven-archiver/pom.properties (modified) (1 diff)
• target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst (modified) (4 diffs)

trunk/src/main/java/omq/common/broker/Broker.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.lang.reflect.Proxy;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -22 +21 @@
 
 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 +54 @@
         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 +63 @@
                 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 +100 @@
 
                 clientStarted = false;
-                connectionClosed = false;
+                // connectionClosed = false;
                 environment = null;
                 remoteObjs = null;
@@ -117 +122 @@
                 connectionClosed = true;
                 connection.close();
-                connectionClosed = false;
+                // connectionClosed = false;
         }
 

trunk/target/maven-archiver/pom.properties

@@ -1 +1 @@
 #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

trunk/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -11 +11 @@
 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 +20 @@
 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 +35 @@
 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 +45 @@
 omq/test/calculator/Calculator.class
 omq/test/exception/Trailer.class
+omq/test/multiThread/MultiInterface.class
 omq/test/observer/RemoteSubjectImpl.class