You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/11/29 22:27:42 UTC
[geode] branch develop updated: GEODE-6014: Removed unnecessary
null checks. (#2906)
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 c902f70 GEODE-6014: Removed unnecessary null checks. (#2906)
c902f70 is described below
commit c902f700af72183b27d2d9b4c8ec68a1cd0b544e
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Thu Nov 29 14:27:33 2018 -0800
GEODE-6014: Removed unnecessary null checks. (#2906)
---
.../main/java/org/apache/geode/cache/client/internal/PoolImpl.java | 7 -------
.../geode/cache/query/internal/index/CompactMapRangeIndex.java | 2 +-
.../java/org/apache/geode/codeAnalysis/decode/CompiledClass.java | 4 ----
.../rest/internal/web/controllers/AbstractBaseController.java | 3 ---
4 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
index 491e01b..053c48c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java
@@ -1459,13 +1459,6 @@ public class PoolImpl implements InternalPool {
}
return null;
} else {
- if (cache == null && dsys != null) {
- cache = dsys.getCache();
- if (cache == null) {
- throw new IllegalStateException(
- "Cache must be created before creating pool");
- }
- }
if (cacheCriterion == null) {
cacheCriterion = cache.getCancelCriterion();
} else if (cacheCriterion != cache.getCancelCriterion()) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
index 3b28dd4..ae28dd8 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
@@ -231,7 +231,7 @@ public class CompactMapRangeIndex extends AbstractMapIndex {
Object oldKey = mapKeyToIndexKey.get(mapKey);
if (oldKey == null) {
rg.addMapping(indexKey, value, entry);
- } else if ((oldKey != null && !oldKey.equals(indexKey))) {
+ } else if (!oldKey.equals(indexKey)) {
rg.addMapping(indexKey, value, entry);
rg.removeMapping(oldKey, entry);
}
diff --git a/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java b/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
index edf57f4..63d1b25 100644
--- a/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
+++ b/geode-junit/src/main/java/org/apache/geode/codeAnalysis/decode/CompiledClass.java
@@ -225,10 +225,6 @@ public class CompiledClass implements Comparable {
System.err.println("You must give the name of a class file on the command line");
System.exit(3);
}
- if (classFile == null) {
- System.err.println("Unable to access " + argv[0]);
- System.exit(3);
- }
if (!classFile.canRead()) {
System.err.println("Unable to read " + argv[0]);
System.exit(3);
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
index 9cac156..b98bace 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
@@ -704,9 +704,6 @@ public abstract class AbstractBaseController implements InitializingBean {
"Server has encountered error (illegal or inappropriate arguments).", e);
}
} else {
-
- Assert.state(typeValue != null,
- "The class type of the object to persist in GemFire must be specified in JSON content using the '@type' property!");
Assert.state(
ClassUtils.isPresent(String.valueOf(typeValue),
Thread.currentThread().getContextClassLoader()),