Changeset 59 for trunk/src/main/java/omq/common

Timestamp:

06/26/13 10:01:10 (11 years ago)

Author:

stoda

Message:

private static proxies in Proxymq deleted -> non static proxies moved to Broker

File:

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

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

@@ -4 +4 @@
 import java.net.URL;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
@@ -44 +45 @@
         private Properties environment = null;
         private Map<String, RemoteObject> remoteObjs;
+        private Map<String, Object> proxies = new Hashtable<String, Object>();
 
         public Broker(Properties env) throws Exception {
@@ -71 +73 @@
                         responseListener.kill();
                         eventDispatcher.kill();
-                        Proxymq.stopProxy();
+                        //TODO proxies = null; ??
                 }
                 // Stop all the remote objects working
@@ -123 +125 @@
 
         @SuppressWarnings("unchecked")
-        public <T extends Remote> T lookup(String reference, Class<T> contract) throws RemoteException {
+        public synchronized <T extends Remote> T lookup(String reference, Class<T> contract) throws RemoteException {
                 try {
 
@@ -131 +133 @@
                         }
 
-                        if (!Proxymq.containsProxy(reference)) {
+                        if (!proxies.containsKey(reference)) {
                                 Proxymq proxy = new Proxymq(reference, contract, this);
                                 Class<?>[] array = { contract };
-                                return (T) Proxymq.newProxyInstance(contract.getClassLoader(), array, proxy);
+                                Object newProxy = Proxymq.newProxyInstance(contract.getClassLoader(), array, proxy);
+                                proxies.put(reference, newProxy);
+                                return (T) newProxy;
                         }
-                        return (T) Proxymq.getInstance(reference);
+                        return (T) proxies.get(reference);
 
                 } catch (Exception e) {