You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/30 04:54:25 UTC
[1/2] git commit: Add javadoc.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 431df2913 -> 00f994401
Add javadoc.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0b0ade96
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0b0ade96
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0b0ade96
Branch: refs/heads/master
Commit: 0b0ade96009c385aa77f8d6cf2c9969dd3925ef3
Parents: 431df29
Author: Matt Sicker <ma...@apache.org>
Authored: Mon Sep 29 21:45:23 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Mon Sep 29 21:45:23 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/util/ProviderUtil.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0b0ade96/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index bc3f774..f82b67e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -30,6 +30,9 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* <em>Consider this class private.</em>
+ * Utility class for Log4j {@link Provider}s. When integrating with an application container framework, any Log4j
+ * Providers not accessible through standard classpath scanning should {@link #loadProvider(java.net.URL, ClassLoader)}
+ * a classpath accordingly.
*/
public final class ProviderUtil {
[2/2] git commit: Fix warning.
Posted by ma...@apache.org.
Fix warning.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/00f99440
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/00f99440
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/00f99440
Branch: refs/heads/master
Commit: 00f9944011c2965244028e7b0953fd2b59e8b9e3
Parents: 0b0ade9
Author: Matt Sicker <ma...@apache.org>
Authored: Mon Sep 29 21:54:19 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Mon Sep 29 21:54:19 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/spi/Provider.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/00f99440/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
index 3756c9e..571d544 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -114,7 +114,6 @@ public class Provider {
*
* @return the ThreadContextMap implementation class or {@code null} if there was an error loading it
*/
- @SuppressWarnings("unchecked")
public Class<? extends ThreadContextMap> loadThreadContextMap() {
if (threadContextMap == null) {
return null;
@@ -122,7 +121,7 @@ public class Provider {
try {
final Class<?> clazz = classLoader.loadClass(threadContextMap);
if (ThreadContextMap.class.isAssignableFrom(clazz)) {
- return (Class<? extends ThreadContextMap>) clazz;
+ return clazz.asSubclass(ThreadContextMap.class);
}
} catch (final Exception e) {
LOGGER.error("Unable to create class {} specified in {}", threadContextMap, url.toString(), e);