geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aging...@apache.org
Subject incubator-geode git commit: GEODE-1687: Added null check for CQs proxy connection.
Date Fri, 29 Jul 2016 01:30:52 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 57ecec70b -> a4f93cdd6


GEODE-1687: Added null check for CQs proxy connection.

When a connection relating to CQ is established or dropped, CqStatusListner is invoked
to indicate connection/subscription status. This allows application to handle if all
the subscription connection is lost for CQs.

Looking at the code path for CqStatusListener there is a chance of NPE getting thrown
in CqServiceImpl.invokeCqsConnected when CQ is executed using the Bridge loader
interface (old way of client-server connection)...


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a4f93cdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a4f93cdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a4f93cdd

Branch: refs/heads/develop
Commit: a4f93cdd634e02de13c169978e61851f810a8a32
Parents: 57ecec7
Author: agingade <agingade@pivotal.io>
Authored: Thu Jul 28 16:30:50 2016 -0700
Committer: agingade <agingade@pivotal.io>
Committed: Thu Jul 28 18:28:56 2016 -0700

----------------------------------------------------------------------
 .../gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4f93cdd/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
index e1e158c..a691a14 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
@@ -2005,7 +2005,7 @@ public final class CqServiceImpl implements CqService  {
   
           //Check cq pool to determine if the pool matches, if not continue.
           //Also if the connected state is already the same, we do not have to send status
again.
-	  if (cQuery == null) {
+	  if (cQuery == null || cQuery.getCQProxy() == null) {
             continue;
           }
           Pool cqPool = cQuery.getCQProxy().getPool();


Mime
View raw message