[geode] branch develop updated: GEODE-5981: No operations on null values (#2775)

[nn...@apache.org]

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

nnag 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 f74cbb7  GEODE-5981: No operations on null values (#2775)
f74cbb7 is described below

commit f74cbb7a6b417e19a0a9fd1ebfdddf8096a5c76a
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Mon Nov 5 10:28:39 2018 -0800

    GEODE-5981: No operations on null values (#2775)
    
    * no method invocation on de-referenced objects.
---
 .../apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java | 2 +-
 .../java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
index 083b39d..faee0c5 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
@@ -56,7 +56,7 @@ public class JdbcConnectorServiceImpl implements JdbcConnectorService {
         mappingsByRegion.get(alteredMapping.getRegionName());
     if (existingMapping == null) {
       throw new RegionMappingNotFoundException(
-          "RegionMapping for region " + existingMapping.getRegionName() + " was not found");
+          "RegionMapping for the region " + alteredMapping.getRegionName() + " was not found");
     }
 
     mappingsByRegion.put(existingMapping.getRegionName(), alteredMapping);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
index bd6b7fb..b0902c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DumpB2NRegion.java
@@ -108,7 +108,6 @@ public class DumpB2NRegion extends PartitionMessage {
           Thread.sleep(2000);
         } catch (InterruptedException e) {
           interrupted = true;
-          pr.checkReadiness();
         } finally {
           if (interrupted)
             Thread.currentThread().interrupt();