Changeset 112 for trunk/src/main/java/omq/common/broker/Broker.java

Timestamp:

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

Author:

stoda

Message:

Tryconnection function mades no sense and does not work as expected

File:

• trunk/src/main/java/omq/common/broker/Broker.java (modified) (6 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;
         }