diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-05-14 13:23:26 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-05-14 13:23:26 +0200 |
| commit | 40ef76037aeac4ee2b9d857a092e5ea026c0bb5c (patch) | |
| tree | 9b3a11ee847e4efe4099143098ca95b66bfb9ba2 /src/main/java/com/c2kernel/entity/proxy/ItemProxy.java | |
| parent | b8f1b6c330ba5117a608ae8113bad6a07d471881 (diff) | |
Refactored Proxy update notification server into its own class and
thread, so executions return before proxy messages are sent. Another
deadlock suspect.
Diffstat (limited to 'src/main/java/com/c2kernel/entity/proxy/ItemProxy.java')
| -rw-r--r-- | src/main/java/com/c2kernel/entity/proxy/ItemProxy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java index 355acd8..f3a2f44 100644 --- a/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java +++ b/src/main/java/com/c2kernel/entity/proxy/ItemProxy.java @@ -392,7 +392,7 @@ public class ItemProxy public void notify(ProxyMessage message) {
Logger.msg(4, "EntityProxy.notify() - Received change notification for "+message.getPath()+" on "+mSystemKey);
synchronized (this){
- if (!message.getServer().equals(ProxyManager.serverName))
+ if (Gateway.getProxyServer()== null || !message.getServer().equals(Gateway.getProxyServer().getServerName()))
Gateway.getStorage().clearCache(mSystemKey, message.getPath());
for (Iterator<MemberSubscription<?>> e = mSubscriptions.keySet().iterator(); e.hasNext();) {
MemberSubscription<?> newSub = e.next();
|