[geode] branch develop updated: GEODE-3591: remove getAnyInstance call (#1027)

[ds...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 44f449c  GEODE-3591: remove getAnyInstance call (#1027)
44f449c is described below

commit 44f449c9abd3d0d047c15bec9395e9e8bfaaaec3
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Wed Nov 8 14:10:20 2017 -0800

    GEODE-3591: remove getAnyInstance call (#1027)
    
    Now the DistributedSystem is passed in to the constructor.
---
 .../apache/geode/internal/cache/tier/sockets/CacheClientProxy.java  | 3 ++-
 .../internal/cache/tier/sockets/ClientInterestMessageImpl.java      | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 0394f65..fee23ae 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1150,7 +1150,8 @@ public class CacheClientProxy implements ClientSession {
     if (Version.GFE_701.compareTo(this.clientVersion) > 0
         && message.getKeyOfInterest() instanceof List) {
       for (Iterator i = ((List) message.getKeyOfInterest()).iterator(); i.hasNext();) {
-        this._messageDispatcher.enqueueMessage(new ClientInterestMessageImpl(message, i.next()));
+        this._messageDispatcher.enqueueMessage(
+            new ClientInterestMessageImpl(getCache().getDistributedSystem(), message, i.next()));
       }
     } else {
       this._messageDispatcher.enqueueMessage(message);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index 3fbd30a..f1b82d1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -19,6 +19,7 @@ import java.io.*;
 
 import org.apache.geode.DataSerializer;
 import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.EventID;
@@ -109,8 +110,9 @@ public class ClientInterestMessageImpl implements ClientMessage {
     this.action = action;
   }
 
-  public ClientInterestMessageImpl(ClientInterestMessageImpl message, Object keyOfInterest) {
-    this.eventId = new EventID(CacheFactory.getAnyInstance().getDistributedSystem());
+  public ClientInterestMessageImpl(DistributedSystem distributedSystem,
+      ClientInterestMessageImpl message, Object keyOfInterest) {
+    this.eventId = new EventID(distributedSystem);
     this.regionName = message.regionName;
     this.keyOfInterest = keyOfInterest;
     this.interestType = message.interestType;

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].