[tomcat] branch master updated: Fix IDE warning (c1 must be null here)

[ma...@apache.org]

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

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d6ba20  Fix IDE warning (c1 must be null here)
7d6ba20 is described below

commit 7d6ba2091649a56bb19dd0b1e76a5b65d4e8bb18
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 4 08:34:21 2021 +0000

    Fix IDE warning (c1 must be null here)
---
 java/org/apache/tomcat/util/compat/Jre16Compat.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/compat/Jre16Compat.java b/java/org/apache/tomcat/util/compat/Jre16Compat.java
index c142417..0b92c59 100644
--- a/java/org/apache/tomcat/util/compat/Jre16Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre16Compat.java
@@ -49,10 +49,8 @@ class Jre16Compat extends Jre9Compat {
             m2 = c1.getMethod("of", String.class);
             m3 = SocketChannel.class.getMethod("open", ProtocolFamily.class);
         } catch (ClassNotFoundException e) {
-            if (c1 == null) {
-                // Must be pre-Java 16
-                log.debug(sm.getString("jre16Compat.javaPre16"), e);
-            }
+            // Must be pre-Java 16
+            log.debug(sm.getString("jre16Compat.javaPre16"), e);
         } catch (ReflectiveOperationException | IllegalArgumentException e) {
             // Should never happen
             log.error(sm.getString("jre16Compat.unexpected"), e);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org