Changeset 105 for branches/supervisor/src/main/java/omq/server

Timestamp:

10/16/13 16:19:02 (11 years ago)

Author:

stoda

Message:

UID changed to reference
TODO: add UID

Location:

branches/supervisor/src/main/java/omq/server

Files:

• InvocationThread.java (modified) (7 diffs)
• RemoteObject.java (modified) (3 diffs)

branches/supervisor/src/main/java/omq/server/InvocationThread.java

@@ -35 +35 @@
         // RemoteObject
         private RemoteObject obj;
-        private String UID;
+        private String reference;
         private Properties env;
         private boolean idle;
@@ -54 +54 @@
         public InvocationThread(RemoteObject obj) throws Exception {
                 this.obj = obj;
-                this.UID = obj.getRef();
+                this.reference = obj.getRef();
                 this.env = obj.getEnv();
                 this.broker = obj.getBroker();
@@ -176 +176 @@
                 // Get info about which exchange and queue will use
                 String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
-                String queue = UID;
-                String routingKey = UID;
+                String queue = reference;
+                String routingKey = reference;
 
                 // RemoteObject default queue
@@ -192 +192 @@
                         channel.queueBind(queue, exchange, routingKey);
                 }
-                logger.info("RemoteObject: " + UID + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
+                logger.info("RemoteObject: " + reference + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
                                 + exclusive + ", AutoDelete: " + autoDelete);
 
@@ -200 +200 @@
 
                 // Get info about the multiQueue
-                String multiExchange = multi + UID;
-                // TODO:String multiExchange = multi + exchange + UID;
+                String multiExchange = multi + reference;
+                // TODO:String multiExchange = multi + exchange + reference;
                 multiQueue = env.getProperty(ParameterQueue.MULTI_QUEUE_NAME);
 
@@ -217 +217 @@
                 }
                 channel.queueBind(multiQueue, multiExchange, "");
-                logger.info("RemoteObject: " + UID + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
+                logger.info("RemoteObject: " + reference + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
                                 + ", Exclusive: " + multiExclusive + ", AutoDelete: " + multiAutoDelete);
 
@@ -236 +236 @@
 
         public void kill() throws IOException {
-                logger.info("Killing objectmq: " + UID + " thread id");
+                logger.info("Killing objectmq: " + reference + " thread id");
                 killed = true;
                 interrupt();

branches/supervisor/src/main/java/omq/server/RemoteObject.java

@@ -30 +30 @@
         private static final Logger logger = Logger.getLogger(RemoteObject.class.getName());
 
-        private String UID;
+        private String reference;
         private Properties env;
         private transient Broker broker;
@@ -61 +61 @@
         public void startRemoteObject(String reference, Broker broker, Properties env) throws Exception {
                 this.broker = broker;
-                this.UID = reference;
+                this.reference = reference;
                 this.env = env;
 
@@ -87 +87 @@
         @Override
         public String getRef() {
-                return UID;
+                return reference;
         }