[tomcat] 02/02: Remove unnecessary null check

[markt]

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

commit 9e052debfe53cbc30cf6bec48670d3c1db848817
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 28 11:31:37 2019 +0000

    Remove unnecessary null check
---
 java/org/apache/catalina/startup/Catalina.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index d89bdba..f6b1446 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -566,13 +566,9 @@ public class Catalina {
             digester.push(this);
             digester.parse(inputSource);
         } catch (Exception e) {
-            if  (file == null) {
-                log.warn(sm.getString("catalina.configFail", getConfigFile() + 
"] or [server-embed.xml"), e);
-            } else {
-                log.warn(sm.getString("catalina.configFail", 
file.getAbsolutePath()), e);
-                if (file.exists() && !file.canRead()) {
-                    log.warn(sm.getString("catalina.incorrectPermissions"));
-                }
+            log.warn(sm.getString("catalina.configFail", 
file.getAbsolutePath()), e);
+            if (file.exists() && !file.canRead()) {
+                log.warn(sm.getString("catalina.incorrectPermissions"));
             }
             return;
         }


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