Refactor.

It is more verbose but it stops Eclipse complaining about a possible NPE. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1800202 13f79535-47bb-0310-9956-ffa450edef68
yuexuahandao · Jun 28, 2017 · 77b1a50 · 77b1a50
1 parent 93ae8bd
commit 77b1a50
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java
@@ -106,9 +106,13 @@ public class FileHandler extends Handler {
 
                 {
                     SecurityManager s = System.getSecurityManager();
-                    this.isSecurityEnabled = s != null;
-                    this.group = isSecurityEnabled ? s.getThreadGroup()
-                            : Thread.currentThread().getThreadGroup();
+                    if (s == null) {
+                        this.isSecurityEnabled = false;
+                        this.group = Thread.currentThread().getThreadGroup();
+                    } else {
+                        this.isSecurityEnabled = true;
+                        this.group = s.getThreadGroup();
+                    }
                 }
 
                 @Override