Merge pull request #270 from fl4via/LOGMGR-258master

[LOGMGR-258] At non static points, invoke doPrivileged only if Securi…
jboss-logging · Jul 24, 2019 · e2d47bb · e2d47bb
2 parents 416b03f + d0a38a9
commit e2d47bb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/core/src/main/java/org/jboss/logmanager/CallerClassLoaderLogContextSelector.java b/core/src/main/java/org/jboss/logmanager/CallerClassLoaderLogContextSelector.java
@@ -118,7 +118,8 @@ private LogContext check(final ClassLoader classLoader) {
      */
     @Override
     public LogContext getLogContext() {
-        return AccessController.doPrivileged(logContextAction);
+        return System.getSecurityManager() == null? logContextAction.run() :
+                AccessController.doPrivileged(logContextAction);
     }
 
     /**

diff --git a/core/src/main/java/org/jboss/logmanager/ClassLoaderLogContextSelector.java b/core/src/main/java/org/jboss/logmanager/ClassLoaderLogContextSelector.java
@@ -118,7 +118,8 @@ private LogContext check(final ClassLoader classLoader) {
      * with any log context.
      */
     public LogContext getLogContext() {
-        return AccessController.doPrivileged(logContextAction);
+        return System.getSecurityManager() == null? logContextAction.run() :
+                AccessController.doPrivileged(logContextAction);
     }
 
     /**

diff --git a/core/src/main/java/org/jboss/logmanager/ContextClassLoaderLogContextSelector.java b/core/src/main/java/org/jboss/logmanager/ContextClassLoaderLogContextSelector.java
@@ -69,7 +69,8 @@ public LogContext run() {
     };
 
     public LogContext getLogContext() {
-        return doPrivileged(logContextAction);
+        return System.getSecurityManager() == null? logContextAction.run() :
+                doPrivileged(logContextAction);
     }
 
     /**

diff --git a/core/src/main/java/org/jboss/logmanager/formatters/Formatters.java b/core/src/main/java/org/jboss/logmanager/formatters/Formatters.java
@@ -811,26 +811,33 @@ public static FormatStep exceptionFormatStep(final boolean leftJustify, final in
     public static FormatStep exceptionFormatStep(final boolean leftJustify, final int minimumWidth, final boolean truncateBeginning, final int maximumWidth, final String argument, final boolean extended) {
         return new JustifyingFormatStep(leftJustify, minimumWidth, truncateBeginning, maximumWidth) {
             public void renderRaw(Formatter formatter, final StringBuilder builder, final ExtLogRecord record) {
-                doPrivileged(new PrivilegedAction<Void>() {
-                    public Void run() {
-                        final Throwable t = record.getThrown();
-                        if (t != null) {
-                            int depth = -1;
-                            if (argument != null) {
-                                try {
-                                    depth = Integer.parseInt(argument);
-                                } catch (NumberFormatException ignore) {
-                                }
-                            }
-                            StackTraceFormatter.renderStackTrace(builder, t, extended, depth);
+                if (System.getSecurityManager() != null)
+                    doPrivileged(new PrivilegedAction<Void>() {
+                        public Void run() {
+                            doExceptionFormatStep(builder, record, argument, extended);
+                            return null;
                         }
-                        return null;
-                    }
-                });
+                    });
+                else
+                    doExceptionFormatStep(builder, record, argument, extended);
             }
         };
     }
 
+    private static void doExceptionFormatStep(final StringBuilder builder, final ExtLogRecord record, final String argument, final boolean extended) {
+        final Throwable t = record.getThrown();
+        if (t != null) {
+            int depth = -1;
+            if (argument != null) {
+                try {
+                    depth = Integer.parseInt(argument);
+                } catch (NumberFormatException ignore) {
+                }
+            }
+            StackTraceFormatter.renderStackTrace(builder, t, extended, depth);
+        }
+    }
+
     /**
      * Create a format step which emits the log message resource key (if any) with the given justification rules.
      *