You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/01/24 05:08:13 UTC
logging-log4j2 git commit: [LOG4J2-2182] NullPointerException at
org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81) in
log4j 2.10.0.
Repository: logging-log4j2
Updated Branches:
refs/heads/master adc1ea820 -> 31b390e39
[LOG4J2-2182] NullPointerException at
org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81)
in log4j 2.10.0.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/31b390e3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/31b390e3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/31b390e3
Branch: refs/heads/master
Commit: 31b390e39eeb0ab653491e29c6b9106304f350f6
Parents: adc1ea8
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Jan 23 22:08:01 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Jan 23 22:08:01 2018 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/util/Activator.java | 46 +++++++++++++++-----
src/changes/changes.xml | 3 ++
2 files changed, 38 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31b390e3/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
index 5067b86..c7910e5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
@@ -67,7 +67,12 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
try {
checkPermission(new AdminPermission(bundle, AdminPermission.RESOURCE));
checkPermission(new AdaptPermission(BundleWiring.class.getName(), bundle, AdaptPermission.ADAPT));
- loadProvider(bundle.getBundleContext(), bundle.adapt(BundleWiring.class));
+ final BundleContext bundleContext = bundle.getBundleContext();
+ if (bundleContext == null) {
+ LOGGER.debug("Bundle {} has no context (state={}), skipping loading provider", bundle.getSymbolicName(), toStateString(bundle.getState()));
+ } else {
+ loadProvider(bundleContext, bundle.adapt(BundleWiring.class));
+ }
} catch (final SecurityException e) {
LOGGER.debug("Cannot access bundle [{}] contents. Ignoring.", bundle.getSymbolicName(), e);
} catch (final Exception e) {
@@ -75,13 +80,32 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
}
}
- private void loadProvider(final BundleContext context, final BundleWiring bundleWiring) {
+ private String toStateString(final int state) {
+ switch (state) {
+ case Bundle.UNINSTALLED:
+ return "UNINSTALLED";
+ case Bundle.INSTALLED:
+ return "INSTALLED";
+ case Bundle.RESOLVED:
+ return "RESOLVED";
+ case Bundle.STARTING:
+ return "STARTING";
+ case Bundle.STOPPING:
+ return "STOPPING";
+ case Bundle.ACTIVE:
+ return "ACTIVE";
+ default:
+ return Integer.toString(state);
+ }
+ }
+
+ private void loadProvider(final BundleContext bundleContext, final BundleWiring bundleWiring) {
final String filter = "(APIVersion>=2.60)";
try {
- final Collection<ServiceReference<Provider>> serviceReferences = context.getServiceReferences(Provider.class, filter);
+ final Collection<ServiceReference<Provider>> serviceReferences = bundleContext.getServiceReferences(Provider.class, filter);
Provider maxProvider = null;
for (final ServiceReference<Provider> serviceReference : serviceReferences) {
- final Provider provider = context.getService(serviceReference);
+ final Provider provider = bundleContext.getService(serviceReference);
if (maxProvider == null || provider.getPriority() > maxProvider.getPriority()) {
maxProvider = provider;
}
@@ -99,16 +123,16 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
}
@Override
- public void start(final BundleContext context) throws Exception {
+ public void start(final BundleContext bundleContext) throws Exception {
ProviderUtil.STARTUP_LOCK.lock();
lockingProviderUtil = true;
- final BundleWiring self = context.getBundle().adapt(BundleWiring.class);
+ final BundleWiring self = bundleContext.getBundle().adapt(BundleWiring.class);
final List<BundleWire> required = self.getRequiredWires(LoggerContextFactory.class.getName());
for (final BundleWire wire : required) {
- loadProvider(context, wire.getProviderWiring());
+ loadProvider(bundleContext, wire.getProviderWiring());
}
- context.addBundleListener(this);
- final Bundle[] bundles = context.getBundles();
+ bundleContext.addBundleListener(this);
+ final Bundle[] bundles = bundleContext.getBundles();
for (final Bundle bundle : bundles) {
loadProvider(bundle);
}
@@ -123,8 +147,8 @@ public class Activator implements BundleActivator, SynchronousBundleListener {
}
@Override
- public void stop(final BundleContext context) throws Exception {
- context.removeBundleListener(this);
+ public void stop(final BundleContext bundleContext) throws Exception {
+ bundleContext.removeBundleListener(this);
unlockIfReady();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/31b390e3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 728b0ba..5878e75 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -140,6 +140,9 @@
<action issue="LOG4J2-2214" dev="ggregory" type="update" due-to="Daniel Feist, Gary Gregory">
Unnecessary contention in DefaultThreadContextMap.
</action>
+ <action issue="LOG4J2-2182" dev="ggregory" type="update" due-to="liwenxian2017, Gary Gregory">
+ NullPointerException at org.apache.logging.log4j.util.Activator.loadProvider(Activator.java:81) in log4j 2.10.0.
+ </action>
<!--
<action issue="LOG4J2-2205" dev="ggregory" type="update" due-to="Björn Kautler">
New module log4j-mongodb3: Remove use of deprecated MongoDB APIs and code to the Java driver version 3 API.