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/14 23:22:40 UTC
[geode] branch develop updated: GEODE-6014: Removed unnecessary
null checks. (#2813)
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 4cc2d46 GEODE-6014: Removed unnecessary null checks. (#2813)
4cc2d46 is described below
commit 4cc2d4629d8f1890db98108289f01230a1360422
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Wed Nov 14 15:22:31 2018 -0800
GEODE-6014: Removed unnecessary null checks. (#2813)
---
.../session/catalina/DeltaSessionManager.java | 22 ++++++++------------
.../internal/DistributedSystemConfigImpl.java | 2 +-
.../geode/cache/client/internal/PoolImpl.java | 4 ++--
.../query/internal/CompiledGroupBySelect.java | 2 +-
.../cache/query/internal/index/HashIndex.java | 2 +-
.../internal/ClusterDistributionManager.java | 3 ---
.../distributed/internal/tcpserver/TcpClient.java | 10 ++++-----
.../java/org/apache/geode/internal/OSProcess.java | 1 -
.../admin/remote/RemoteGfManagerAgent.java | 2 +-
.../geode/internal/cache/AbstractRegion.java | 6 +++---
.../geode/internal/cache/AbstractRegionMap.java | 2 +-
.../apache/geode/internal/cache/FilterProfile.java | 8 ++------
.../geode/internal/cache/PartitionedRegion.java | 15 ++++----------
.../internal/cache/PartitionedRegionDataStore.java | 2 +-
.../geode/internal/cache/ServerPingMessage.java | 2 +-
.../geode/internal/cache/StateFlushOperation.java | 2 +-
.../geode/internal/cache/entries/DiskEntry.java | 8 ++++----
.../internal/cache/locks/TXLockServiceImpl.java | 7 ++-----
.../cache/tier/sockets/CacheClientNotifier.java | 8 +-------
.../internal/cache/xmlcache/CacheXmlGenerator.java | 4 ++--
.../concurrent/CompactConcurrentHashSet2.java | 14 ++++++-------
.../geode/internal/shared/NativeCallsJNAImpl.java | 5 +++--
.../management/internal/ManagementFunction.java | 10 +--------
.../internal/beans/LocatorMBeanBridge.java | 12 ++++-------
.../cli/commands/CompactDiskStoreCommand.java | 2 +-
.../GetMemberConfigInformationFunction.java | 24 ++++++++++------------
.../management/internal/cli/json/TypedJson.java | 16 +++++++--------
.../internal/cli/util/ReadWriteFile.java | 10 +++------
.../cache/query/internal/cq/CqServiceImpl.java | 3 +--
.../cache/tier/sockets/command/CloseCQ.java | 10 ++++-----
.../cli/functions/LuceneSearchIndexFunction.java | 4 +---
.../internal/distributed/LuceneQueryFunction.java | 2 +-
32 files changed, 84 insertions(+), 140 deletions(-)
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
index b4dc753..f22e398 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
@@ -510,7 +510,7 @@ public abstract class DeltaSessionManager extends ManagerBase
getSessionsToTouch().clear();
// Touch the sessions we currently have
- if (sessionIds != null && (!sessionIds.isEmpty())) {
+ if (!sessionIds.isEmpty()) {
getSessionCache().touchSessions(sessionIds);
if (getLogger().isDebugEnabled()) {
getLogger().debug(DeltaSessionManager.this + ": Touched sessions: " + sessionIds);
@@ -860,19 +860,15 @@ public abstract class DeltaSessionManager extends ManagerBase
return;
} catch (IOException e) {
getLogger().error("Exception loading sessions", e);
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException f) {
- // Ignore
- }
+ try {
+ fis.close();
+ } catch (IOException f) {
+ // Ignore
}
- if (bis != null) {
- try {
- bis.close();
- } catch (IOException f) {
- // Ignore
- }
+ try {
+ bis.close();
+ } catch (IOException f) {
+ // Ignore
}
throw e;
}
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 3567264..2f429e5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -720,7 +720,7 @@ public class DistributedSystemConfigImpl implements DistributedSystemConfig {
// {cmd}
if (!isSwitch && !isHostOrCmd) {
final String previous =
- (array == null || array.isEmpty()) ? null : array.get(array.size() - 1);
+ array.isEmpty() ? null : array.get(array.size() - 1);
final boolean isValueForSwitch = previous != null && previous.startsWith("-");
final boolean isHostWithUser = string.contains("@") && string.endsWith("{host}");
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 40ff831..67bbe6c 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
@@ -1430,14 +1430,14 @@ public class PoolImpl implements InternalPool {
if (cacheCriterion != null) {
return cacheCriterion.generateCancelledException(e);
}
- } else {
- if (cache == null && dsys != null) {
+ if (dsys != null) {
cache = dsys.getCache();
if (cache == null) {
throw new IllegalStateException(
"Cache must be created before creating pool");
}
}
+ } else {
if (cacheCriterion == null || cacheCriterion != cache.getCancelCriterion()) {
cacheCriterion = cache.getCancelCriterion();
}
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
index 5ff1f4f..3c0824f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledGroupBySelect.java
@@ -450,7 +450,7 @@ public class CompiledGroupBySelect extends CompiledSelect {
// check if all the group by fields are present in projected columns
if (this.groupBy != null) {
- int numGroupCols = this.groupBy != null ? this.groupBy.size() : 0;
+ int numGroupCols = this.groupBy.size();
int numColsInProj = this.projAttrs.size();
numColsInProj -= this.aggregateFunctions.length;
if (numGroupCols != numColsInProj) {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
index 435d277..92c1d38 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java
@@ -590,7 +590,7 @@ public class HashIndex extends AbstractIndex {
boolean applyOrderBy, boolean asc, long iteratorCreationTime) throws FunctionDomainException,
TypeMismatchException, NameResolutionException, QueryInvocationTargetException {
QueryObserver observer = QueryObserverHolder.getInstance();
- if (result == null || (limit != -1 && result != null && result.size() == limit)) {
+ if (result == null || limit != -1 && result.size() == limit) {
return;
}
List orderedKeys = null;
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
index cb03851..c523164 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
@@ -1321,9 +1321,6 @@ public class ClusterDistributionManager implements DistributionManager {
this.hostedLocatorsAll = tmp;
if (isSharedConfigurationEnabled) {
- if (locators == null || locators.isEmpty()) {
- throw new IllegalArgumentException("Cannot use empty collection of locators");
- }
if (this.hostedLocatorsWithSharedConfiguration.isEmpty()) {
this.hostedLocatorsWithSharedConfiguration = new HashMap<>();
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
index b81a0b4..f83dc8c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java
@@ -315,13 +315,11 @@ public class TcpClient {
"Unrecognisable response received: This could be the result of trying to connect a non-SSL-enabled client to an SSL-enabled locator.");
}
VersionResponse response = (VersionResponse) readObject;
- if (response != null) {
- serverVersion = Short.valueOf(response.getVersionOrdinal());
- synchronized (serverVersions) {
- serverVersions.put(ipAddr, serverVersion);
- }
- return serverVersion;
+ serverVersion = Short.valueOf(response.getVersionOrdinal());
+ synchronized (serverVersions) {
+ serverVersions.put(ipAddr, serverVersion);
}
+ return serverVersion;
} catch (EOFException ex) {
// old locators will not recognize the version request and will close the connection
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
index 4ca19ba..fbdfa93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/OSProcess.java
@@ -774,7 +774,6 @@ public class OSProcess {
redirectCOutput(newOutput.getPath());
}
}
- assert newPrintStream != null;
return newPrintStream;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
index 92a8657..9731551 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/remote/RemoteGfManagerAgent.java
@@ -774,7 +774,7 @@ class RemoteGfManagerAgent implements GfManagerAgent {
}
if (collector != null) {
GemFireVM vm = getMemberById(sender);
- if (vm != null && collector != null) {
+ if (vm != null) {
collector.resultsReturned(results, vm, snapshotId);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index b504b33..299e912 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -289,9 +289,9 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
}
evictionAttributes = new EvictionAttributesImpl(attrs.getEvictionAttributes());
- if (attrs.getPartitionAttributes() != null && this.evictionAttributes != null
- && this.evictionAttributes.getAlgorithm().isLRUMemory()
- && attrs.getPartitionAttributes().getLocalMaxMemory() != 0 && this.evictionAttributes
+ if (attrs.getPartitionAttributes() != null && this.evictionAttributes.getAlgorithm()
+ .isLRUMemory() && attrs.getPartitionAttributes().getLocalMaxMemory() != 0
+ && this.evictionAttributes
.getMaximum() != attrs.getPartitionAttributes().getLocalMaxMemory()) {
logger.warn(
"For region {} with data policy PARTITION, memory LRU eviction attribute maximum has been reset from {}MB to local-max-memory {}MB",
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 3669ed8..bc4d38c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -2168,7 +2168,7 @@ public abstract class AbstractRegionMap
// For distributed transactions, stuff the next region version generated
// in phase-1 commit into the callbackEvent so that ARE.generateVersionTag can later
// just apply it and not regenerate it in phase-2 commit
- if (callbackEvent != null && txEntryState != null
+ if (txEntryState != null
&& txEntryState.getDistTxEntryStates() != null) {
callbackEvent.setNextRegionVersion(txEntryState.getDistTxEntryStates().getRegionVersion());
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index 72f5f8c..7e763b0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -1169,11 +1169,7 @@ public class FilterProfile implements DataSerializableFixedID {
Set clients = null;
int size = putAllData.length;
CqService cqService = getCqService(dpao.getRegion());
- boolean doCQs = cqService.isRunning()
- && this.region != null /*
- * && !(this.region.isUsedForPartitionedRegionBucket() ||
- * (this.region instanceof PartitionedRegion))
- */;
+ boolean doCQs = cqService.isRunning();
for (int idx = 0; idx < size; idx++) {
PutAllEntryData pEntry = putAllData[idx];
if (pEntry != null) {
@@ -1228,7 +1224,7 @@ public class FilterProfile implements DataSerializableFixedID {
Set clients = null;
int size = removeAllData.length;
CqService cqService = getCqService(op.getRegion());
- boolean doCQs = cqService.isRunning() && this.region != null;
+ boolean doCQs = cqService.isRunning();
for (int idx = 0; idx < size; idx++) {
RemoveAllEntryData pEntry = removeAllData[idx];
if (pEntry != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 55a239b..f3e86d2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -3646,11 +3646,6 @@ public class PartitionedRegion extends LocalRegion
targetNode = getOrCreateNodeForBucketRead(bucketId);
}
}
- if (targetNode == null) {
- throw new FunctionException(
- String.format("No target node found for KEY, %s",
- key));
- }
} else {
execution.clearFailedNodes();
}
@@ -8083,7 +8078,7 @@ public class PartitionedRegion extends LocalRegion
InternalDistributedMember lastTarget = bucketNode;
bucketNode = getOrCreateNodeForBucketRead(lbucket);
- if (lastTarget != null && lastTarget.equals(bucketNode)) {
+ if (lastTarget.equals(bucketNode)) {
if (retryTime.overMaximum()) {
break;
}
@@ -8685,7 +8680,7 @@ public class PartitionedRegion extends LocalRegion
// Check if the returned value is instance of Index (this means the index is
// not in create phase, its created successfully).
- if (prIndex == null || !(prIndex instanceof Index)) {
+ if (!(prIndex instanceof Index)) {
logger.info("This index {} is not on this partitoned region : {}",
ind, this);
return numBuckets;
@@ -8704,10 +8699,8 @@ public class PartitionedRegion extends LocalRegion
// After removing from region wait for removing from index manager and
// marking the index invalid.
- if (prIndex != null) {
- PartitionedIndex index = (PartitionedIndex) prIndex;
- index.acquireIndexWriteLockForRemove();
- }
+ PartitionedIndex index = (PartitionedIndex) prIndex;
+ index.acquireIndexWriteLockForRemove();
this.indexes.remove(indexTask);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index ab644d0..38488c9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -2128,7 +2128,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
throw new PRLocallyDestroyedException(rde);
} else {
this.getPartitionedRegion().checkReadiness();
- if (r != null && r.isBucketDestroyed()) {
+ if (r.isBucketDestroyed()) {
// bucket moved by rebalance
throw new ForceReattemptException("Bucket removed during remoteGetKeys", rde);
} else {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
index 36fb57f..d89e577 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
@@ -67,7 +67,7 @@ public class ServerPingMessage extends PooledDistributionMessage {
filteredRecipients.add(recipient);
}
}
- if (filteredRecipients == null || filteredRecipients.size() == 0)
+ if (filteredRecipients.size() == 0)
return true;
ReplyProcessor21 replyProcessor = new ReplyProcessor21(dm, filteredRecipients);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
index 6438462..b4d60fa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java
@@ -558,7 +558,7 @@ public class StateFlushOperation {
try {
if (channelState != null) {
if (logger.isTraceEnabled(LogMarker.STATE_FLUSH_OP_VERBOSE)
- && ((channelState != null) && (channelState.size() > 0))) {
+ && (channelState.size() > 0)) {
logger.trace(LogMarker.STATE_FLUSH_OP_VERBOSE, "Waiting for channel states: {}",
channelStateDescription(channelState));
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
index 98e0c1b..ab25c2f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
@@ -146,9 +146,9 @@ public interface DiskEntry extends RegionEntry {
dr.acquireReadLock();
try {
synchronized (id) {
- if (id == null || (dr.isBackup() && id.getKeyId() == DiskRegion.INVALID_ID)
- || (!entry.isValueNull() && id.needsToBeWritten()
- && !EntryBits.isRecoveredFromDisk(id.getUserBits()))/* fix for bug 41942 */) {
+ if (dr.isBackup() && id.getKeyId() == DiskRegion.INVALID_ID || !entry.isValueNull() && id
+ .needsToBeWritten() && !EntryBits
+ .isRecoveredFromDisk(id.getUserBits())/* fix for bug 41942 */) {
return null;
}
@@ -177,7 +177,7 @@ public interface DiskEntry extends RegionEntry {
dr.acquireReadLock();
try {
synchronized (did) {
- if (did == null || (dr.isBackup() && did.getKeyId() == DiskRegion.INVALID_ID)) {
+ if (dr.isBackup() && did.getKeyId() == DiskRegion.INVALID_ID) {
return null;
} else if (!entry.isValueNull() && did.needsToBeWritten()
&& !EntryBits.isRecoveredFromDisk(did.getUserBits())/* fix for bug 41942 */) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
index b770968..16446c8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
@@ -146,12 +146,9 @@ public class TXLockServiceImpl extends TXLockService {
Thread.currentThread().interrupt();
logger.debug("[TXLockServiceImpl.txLock] was interrupted", e);
if (gotLocks) {
- if (txLockId != null) {
- synchronized (this.txLockIdList) {
- this.txLockIdList.remove(txLockId);
- }
+ synchronized (this.txLockIdList) {
+ this.txLockIdList.remove(txLockId);
}
- gotLocks = false;
}
// TODO: change to be TransactionFailedException (after creating TFE)...
throw new CommitConflictException(
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 84f5715..6245447 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -339,7 +339,7 @@ public class CacheClientNotifier {
}
Subject shiroSubject =
- subject != null && subject instanceof Subject ? (Subject) subject : null;
+ subject instanceof Subject ? (Subject) subject : null;
proxy = registerClient(socket, proxyID, proxy, isPrimary, clientConflation, clientVersion,
acceptorId, notifyBySubscription, shiroSubject);
@@ -354,12 +354,6 @@ public class CacheClientNotifier {
String postAuthzFactoryName = sysProps.getProperty(SECURITY_CLIENT_ACCESSOR_PP);
if (postAuthzFactoryName != null && postAuthzFactoryName.length() > 0) {
- if (principal == null) {
- securityLogWriter.warning(
- String.format(
- "CacheClientNotifier: Post process authorization callback enabled but authentication callback (%s) returned with null credentials for proxyID: %s",
- new Object[] {SECURITY_CLIENT_AUTHENTICATOR, proxyID}));
- }
Method authzMethod = ClassLoadUtil.methodFromName(postAuthzFactoryName);
authzCallback = (AccessControl) authzMethod.invoke(null, (Object[]) null);
authzCallback.init(principal, member, this.getCache());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
index cf40349..3fa1caf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -2027,7 +2027,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
|| ((RegionAttributesCreation) attrs).hasGatewaySenderId())) {
Set<String> senderIds = new HashSet<String>(attrs.getGatewaySenderIds());
StringBuilder senderStringBuff = new StringBuilder();
- if (senderIds != null && senderIds.size() != 0) {
+ if (senderIds.size() != 0) {
for (String senderId : senderIds) {
if (!(senderStringBuff.length() == 0)) {
senderStringBuff.append(",");
@@ -2045,7 +2045,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
|| ((RegionAttributesCreation) attrs).hasAsyncEventListeners())) {
Set<String> asyncEventQueueIds = new HashSet<String>(attrs.getAsyncEventQueueIds());
StringBuilder asyncEventQueueStringBuff = new StringBuilder();
- if (asyncEventQueueIds != null && asyncEventQueueIds.size() != 0) {
+ if (asyncEventQueueIds.size() != 0) {
for (String asyncEventQueueId : asyncEventQueueIds) {
if (!(asyncEventQueueStringBuff.length() == 0)) {
asyncEventQueueStringBuff.append(",");
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
index 9948cd0..e75a60b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
@@ -351,10 +351,8 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
}
public boolean equals(Object o) {
- Object k, u;
- Node<?> e;
- return ((o instanceof Node) && ((k = (e = (Node<?>) o)) != null)
- && (k == key || k.equals(key)));
+ return ((o instanceof Node)
+ && (o == key || o.equals(key)));
}
/**
@@ -1711,14 +1709,14 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
else
sp.right = p;
}
- if ((s.right = pr) != null)
- pr.parent = s;
+ s.right = pr;
+ pr.parent = s;
}
p.left = null;
if ((p.right = sr) != null)
sr.parent = p;
- if ((s.left = pl) != null)
- pl.parent = s;
+ s.left = pl;
+ pl.parent = s;
if ((s.parent = pp) == null)
r = s;
else if (p == pp.left)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
index 69adc26..ea22e7f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/shared/NativeCallsJNAImpl.java
@@ -966,8 +966,9 @@ public class NativeCallsJNAImpl {
return false;
} else {
final IntByReference status = new IntByReference();
- final boolean result = Kernel32.GetExitCodeProcess(procHandle, status) && status != null
- && status.getValue() == Kernel32.STILL_ACTIVE;
+ final boolean result =
+ Kernel32.GetExitCodeProcess(procHandle, status)
+ && status.getValue() == Kernel32.STILL_ACTIVE;
Kernel32.CloseHandle(procHandle);
return result;
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
index b52b575..aae18fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementFunction.java
@@ -18,10 +18,8 @@ import java.io.Serializable;
import javax.management.Attribute;
import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.ReflectionException;
import org.apache.logging.log4j.Logger;
@@ -121,17 +119,11 @@ public class ManagementFunction implements InternalFunction {
if (cache != null && !cache.isClosed()) {
sendException(e, fc);
}
- } catch (ReflectionException e) {
- sendException(e, fc);
- } catch (MBeanException e) {
- sendException(e, fc);
- } catch (NullPointerException e) {
- sendException(e, fc);
} catch (Exception e) {
sendException(e, fc);
} finally {
if (!executedSuccessfully) {
- if (cache == null || (cache != null && cache.isClosed())) {
+ if (cache == null || cache.isClosed()) {
Exception e =
new Exception("Member Is Shutting down");
sendException(e, fc);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
index 0e7894f..0ea3c32 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/LocatorMBeanBridge.java
@@ -122,15 +122,11 @@ public class LocatorMBeanBridge {
mainTail = "";
}
- if (mainTail == null) {
- return "No log file configured, log messages will be directed to stdout.";
- } else {
- StringBuffer result = new StringBuffer();
- if (mainTail != null) {
- result.append(mainTail);
- }
- return result.toString();
+ StringBuffer result = new StringBuffer();
+ if (mainTail != null) {
+ result.append(mainTail);
}
+ return result.toString();
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java
index f2cd8e0..a14fa45 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java
@@ -128,7 +128,7 @@ public class CompactDiskStoreCommand extends InternalGfshCommand {
}
// If compaction happened at all, then prepare the summary
- if (overallCompactInfo != null && !overallCompactInfo.isEmpty()) {
+ if (!overallCompactInfo.isEmpty()) {
Set<Map.Entry<DistributedMember, PersistentID>> entries = overallCompactInfo.entrySet();
for (Map.Entry<DistributedMember, PersistentID> entry : entries) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index 0debb3e..58f9f65 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -197,19 +197,17 @@ public class GetMemberConfigInformationFunction implements InternalFunction {
// Make a copy to avoid the CME's
Set<String> attributesSet = new HashSet<String>(attributesMap.keySet());
- if (attributesSet != null) {
- for (String attribute : attributesSet) {
- String attributeValue = attributesMap.get(attribute);
- String defaultValue = defaultAttributesMap.get(attribute);
-
- if (attributeValue != null) {
- if (attributeValue.equals(defaultValue)) {
- attributesMap.remove(attribute);
- }
- } else {
- if (defaultValue == null || defaultValue.equals("")) {
- attributesMap.remove(attribute);
- }
+ for (String attribute : attributesSet) {
+ String attributeValue = attributesMap.get(attribute);
+ String defaultValue = defaultAttributesMap.get(attribute);
+
+ if (attributeValue != null) {
+ if (attributeValue.equals(defaultValue)) {
+ attributesMap.remove(attribute);
+ }
+ } else {
+ if (defaultValue == null || defaultValue.equals("")) {
+ attributesMap.remove(attribute);
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
index d0248b4..9d71c94 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/TypedJson.java
@@ -724,15 +724,13 @@ public class TypedJson {
if (number == null) {
return "";
}
- if (number != null) {
- if (number instanceof Double) {
- if (((Double) number).isInfinite() || ((Double) number).isNaN()) {
- return "Non-Finite";
- }
- } else if (number instanceof Float) {
- if (((Float) number).isInfinite() || ((Float) number).isNaN()) {
- return "Non-Finite";
- }
+ if (number instanceof Double) {
+ if (((Double) number).isInfinite() || ((Double) number).isNaN()) {
+ return "Non-Finite";
+ }
+ } else if (number instanceof Float) {
+ if (((Float) number).isInfinite() || ((Float) number).isNaN()) {
+ return "Non-Finite";
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
index 8a2e550..18a2ec0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/ReadWriteFile.java
@@ -150,13 +150,9 @@ public class ReadWriteFile {
}
}
}
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
+ input.close();
+ output.flush();
+ output.close();
return ("Successfully written file " + logFileName);
} catch (FunctionException ex) {
return ("readWriteFile FunctionException " + ex.getMessage());
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
index a2dfabc..de79173 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/internal/cq/CqServiceImpl.java
@@ -1675,8 +1675,7 @@ public class CqServiceImpl implements CqService {
if ((!cQuery.isRunning() && cQuery.getQueuedEvents() == null)) {
if (isDebugEnabled) {
- logger.debug("Unable to invoke CqListener, {}, CqName : {}",
- ((cQuery == null) ? "CQ not found" : " CQ is Not running"), cqName);
+ logger.debug("Unable to invoke CqListener, CQ is Not running, CqName : {}", cqName);
}
continue;
}
diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
index 95365d4..220e898 100644
--- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
+++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java
@@ -92,12 +92,10 @@ public class CloseCQ extends BaseCQCommand {
AuthorizeRequest authzRequest = serverConnection.getAuthzRequest();
if (authzRequest != null) {
- if (cqQuery != null) {
- String queryStr = cqQuery.getQueryString();
- Set cqRegionNames = new HashSet();
- cqRegionNames.add(cqQuery.getRegionName());
- authzRequest.closeCQAuthorize(cqName, queryStr, cqRegionNames);
- }
+ String queryStr = cqQuery.getQueryString();
+ Set cqRegionNames = new HashSet();
+ cqRegionNames.add(cqQuery.getRegionName());
+ authzRequest.closeCQAuthorize(cqName, queryStr, cqRegionNames);
}
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
index 57c952f..c36567b 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneSearchIndexFunction.java
@@ -83,9 +83,7 @@ public class LuceneSearchIndexFunction<K, V> implements InternalFunction {
searchResult.getValue().toString(), searchResult.getScore())));
}
}
- if (result != null) {
- context.getResultSender().lastResult(result);
- }
+ context.getResultSender().lastResult(result);
} catch (LuceneQueryException e) {
result.add(new LuceneSearchResults(true, e.getRootCause().getMessage()));
context.getResultSender().lastResult(result);
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
index 6c33509..ade8fe9 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
@@ -135,7 +135,7 @@ public class LuceneQueryFunction implements InternalFunction<LuceneFunctionConte
}
int resultLimit = searchContext.getLimit();
- CollectorManager manager = (searchContext == null) ? null : searchContext.getCollectorManager();
+ CollectorManager manager = searchContext.getCollectorManager();
if (manager == null) {
manager = new TopEntriesCollectorManager(null, resultLimit);
}