Changeset 47 for trunk/src/main/java/omq/common/broker

Timestamp:

06/18/13 16:51:22 (11 years ago)

Author:

stoda

Message:

Refactoring Environment class - deleted.
StopBroker? problems solved (?)
Server can receive send and receive messages in different formats.
Some tests modified

TODO: finish all the tests, add log4j

File:

• trunk/src/main/java/omq/common/broker/Broker.java (modified) (10 diffs)

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

@@ -12 +12 @@
 import omq.common.event.EventDispatcher;
 import omq.common.event.EventWrapper;
-import omq.common.util.Environment;
 import omq.common.util.OmqConnectionFactory;
 import omq.common.util.ParameterQueue;
@@ -33 +32 @@
         private static boolean clientStarted = false;
         private static boolean connectionClosed = false;
+        private static Properties environment = null;
         // TODO ask Pedro if it can be only one object in the map (an object can
         // have multiple threads in the same broker -see environment-)
@@ -44 +44 @@
          */
         public static synchronized void initBroker(Properties env) throws Exception {
-                if (Environment.isVoid()) {
+                if (environment == null) {
                         remoteObjs = new HashMap<String, RemoteObject>();
-                        Environment.setEnvironment(env);
+                        environment = env;
                         connection = OmqConnectionFactory.getNewConnection(env);
                         channel = connection.createChannel();
@@ -67 +67 @@
                         ResponseListener.stopResponseListner();
                         EventDispatcher.stopEventDispatcher();
+                        Proxymq.stopProxy();
                 }
                 // Stop all the remote objects working
@@ -72 +73 @@
                         unbind(reference);
                 }
+
                 // Close the connection once all the listeners are died
                 closeConnection();
+
+                clientStarted = false;
+                connectionClosed = false;
+                environment = null;
+                remoteObjs = null;
+                Serializer.removeSerializers();
         }
 
@@ -87 +95 @@
                 connectionClosed = true;
                 connection.close();
+                connectionClosed = false;
         }
 
@@ -111 +120 @@
         public static <T extends Remote> T lookup(String reference, Class<T> contract) throws RemoteException {
                 try {
-                        Properties environment = Environment.getEnvironment();
 
                         if (!clientStarted) {
@@ -132 +140 @@
         public static void bind(String reference, RemoteObject remote) throws RemoteException {
                 try {
-                        Properties environment = Environment.getEnvironment();
                         remote.startRemoteObject(reference, environment);
                         remoteObjs.put(reference, remote);
@@ -244 +251 @@
                                                 }
                                                 try {
-                                                        Properties env = Environment.getEnvironment();
-                                                        connection = OmqConnectionFactory.getNewWorkingConnection(env);
+                                                        connection = OmqConnectionFactory.getNewWorkingConnection(environment);
                                                         channel = connection.createChannel();
                                                         addFaultTolerance();
@@ -265 +271 @@
         }
 
+        public static Properties getEnvironment() {
+                return environment;
+        }
+
 }