[commons-jcs] branch master updated: Remove useless null-check.

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git


The following commit(s) were added to refs/heads/master by this push:
     new dd8c262  Remove useless null-check.
dd8c262 is described below

commit dd8c26228f9cf442c997b8e625b2f579c34caf84
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Nov 20 17:25:45 2020 -0500

    Remove useless null-check.
---
 .../java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java    | 2 +-
 .../org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
index 433ee5e..dbeb339 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
@@ -334,7 +334,7 @@ public class LateralCache<K, V>
      */
     public void fixCache( ICacheServiceNonLocal<K, V> restoredLateral )
     {
-        if ( this.lateralCacheService != null && this.lateralCacheService 
instanceof ZombieCacheServiceNonLocal )
+        if ( this.lateralCacheService instanceof ZombieCacheServiceNonLocal )
         {
             ZombieCacheServiceNonLocal<K, V> zombie = 
(ZombieCacheServiceNonLocal<K, V>) this.lateralCacheService;
             this.lateralCacheService = restoredLateral;
diff --git 
a/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java
 
b/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java
index 97575a4..44ebd0e 100644
--- 
a/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java
+++ 
b/commons-jcs-jcache-openjpa/src/main/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java
@@ -49,7 +49,7 @@ public class OpenJPAJCacheDerivation extends 
AbstractProductDerivation
     {
         final Map<?, ?> props = cp.getProperties();
         final Object dcm = Configurations.getProperty("DataCacheManager", 
props);
-        if (dcm != null && JCACHE_NAME.equals(dcm))
+        if (JCACHE_NAME.equals(dcm))
         {
             if (Configurations.getProperty("DataCache", props) == null)
             {