/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache license, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the license for the specific language governing permissions and
 * limitations under the license.
 */
package org.apache.logging.log4j.util;

import java.security.AccessController;
import java.security.PrivilegedAction;

/**
 * Utility class for ClassLoaders. Consider this class private.
 */
// TODO: migrate any other useful methods from Loader in log4j-core
public final class LoaderUtil {
    private LoaderUtil() {}

    private static final PrivilegedAction<ClassLoader> TCCL_GETTER = new ThreadContextClassLoaderGetter();

    static {
        final SecurityManager sm = System.getSecurityManager();
        if (sm != null) {
            sm.checkPermission(new RuntimePermission("getClassLoader"));
        }
    }

    public static ClassLoader getThreadContextClassLoader() {
        return System.getSecurityManager() == null
            ? TCCL_GETTER.run()
            : AccessController.doPrivileged(TCCL_GETTER);
    }

    private static class ThreadContextClassLoaderGetter implements PrivilegedAction<ClassLoader> {
        @Override
        public ClassLoader run() {
            final ClassLoader cl = Thread.currentThread().getContextClassLoader();
            // if the TCCL is null, that means we're using the system CL
            return cl == null ? ClassLoader.getSystemClassLoader() : cl;
        }
    }
}

@@ -924,68 +924,136 @@
 %0A * 
-Utility class for ClassLoaders. Consider this class private.
+%3Cem%3EConsider this class private.%3C/em%3E Utility class for ClassLoaders.%0A * @see ClassLoader%0A * @see Thread#getContextClassLoader()
 %0A */
@@ -1479,24 +1479,204 @@
    %7D%0A    %7D%0A%0A
+    /**%0A     * Gets the current Thread ClassLoader. Returns the system ClassLoader if the TCCL is %7B@code null%7D.%0A     *%0A     * @return the current ThreadContextClassLoader.%0A     */%0A
     public s

Update javadoc.