Repository: logging-log4j2 Updated Branches: refs/heads/master 2c51cde7c -> aba5c6bbb
Add comment regarding recent OSGi change. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/42b58740 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/42b58740 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/42b58740 Branch: refs/heads/master Commit: 42b587402fddf00bd6759b94d6cf76d7676e8141 Parents: 2c51cde Author: Matt Sicker <mattsic...@apache.org> Authored: Fri Sep 5 10:38:41 2014 -0500 Committer: Matt Sicker <mattsic...@apache.org> Committed: Fri Sep 5 10:38:41 2014 -0500 ---------------------------------------------------------------------- log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42b58740/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java index b90ab14..c67299c 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java @@ -83,7 +83,8 @@ public class LogManager { if (factory == null) { final SortedMap<Integer, LoggerContextFactory> factories = new TreeMap<Integer, LoggerContextFactory>(); - + // note that the following initial call to ProviderUtil may block until a Provider has been installed when + // running in an OSGi environment if (ProviderUtil.hasProviders()) { for (final Provider provider : ProviderUtil.getProviders()) { final Class<? extends LoggerContextFactory> factoryClass = provider.loadLoggerContextFactory();
