geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [geode] branch feature/GEODE-4685 updated: GEODE-4685: added check to handle a null type registry
Date Wed, 28 Feb 2018 20:10:33 GMT
This is an automated email from the ASF dual-hosted git repository.

udo pushed a commit to branch feature/GEODE-4685
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-4685 by this push:
     new 883480b  GEODE-4685: added check to handle a null type registry
883480b is described below

commit 883480bdff7fb7b36a9bf00faf3a8ac535181175
Author: Udo <ukohlmeyer@pivotal.io>
AuthorDate: Wed Feb 28 12:10:23 2018 -0800

    GEODE-4685: added check to handle a null type registry
---
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index f0aa07e..2316769 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -5056,7 +5056,12 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache,
Has
    * requested getObject() on the PdxInstance.
    */
   public boolean getPdxReadSerializedByAnyGemFireServices() {
-    Boolean pdxReadSerializedOverriden = this.getPdxRegistry().getPdxReadSerializedOverride();
+    TypeRegistry pdxRegistry = this.getPdxRegistry();
+    boolean pdxReadSerializedOverriden = false;
+    if(pdxRegistry != null){
+     pdxReadSerializedOverriden = pdxRegistry.getPdxReadSerializedOverride();
+    }
+
     return (getPdxReadSerialized() || pdxReadSerializedOverriden)
         && PdxInstanceImpl.getPdxReadSerialized();
   }

-- 
To stop receiving notification emails like this one, please contact
udo@apache.org.

Mime
View raw message