commit cc12c69db7bc3ebd034128f643c6a6f514aa02b6
author Gary Gregory <garydgregory@gmail.com> Fri Nov 20 17:24:37 2020 -0500
committer Gary Gregory <garydgregory@gmail.com> Fri Nov 20 17:24:37 2020 -0500
tree ddb727004ee391d418907cc4569fbef1136af475
parent e58c654dd84142c2f6bd2f559b2f9550780f86ee

Remove useless null-check.

web/src/main/java/org/apache/commons/chain2/web/MapEntry.java

diff --git a/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java b/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
index 40e01da..f881b63 100644
--- a/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
+++ b/web/src/main/java/org/apache/commons/chain2/web/MapEntry.java
@@ -100,7 +100,7 @@
      */
     @Override
     public boolean equals(Object o) {
-        if (o != null && o instanceof Map.Entry) {
+        if (o instanceof Map.Entry) {
             Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
             return (this.getKey() == null ?
                     entry.getKey() == null : this.getKey().equals(entry.getKey()))  &&

web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java

diff --git a/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java b/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
index cd5679d..8600f52 100644
--- a/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
+++ b/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
@@ -84,7 +84,7 @@
          */
         @SuppressWarnings("unchecked")
         Catalog<String, Object, ServletWebContext<String, Object>> catalog =
-                testCatalog != null && testCatalog instanceof Catalog ?
+                testCatalog instanceof Catalog ?
                     (Catalog<String, Object, ServletWebContext<String, Object>>) testCatalog :
                     super.getCatalog(context);