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 2016/03/04 08:09:44 UTC
logging-log4j2 git commit: Fix compiler warning by using a better
ivar name.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 370d965fa -> 463c9ea49
Fix compiler warning by using a better ivar name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/463c9ea4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/463c9ea4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/463c9ea4
Branch: refs/heads/master
Commit: 463c9ea498a4824fb49dfa261a70892c1e9ea282
Parents: 370d965
Author: ggregory <gg...@apache.org>
Authored: Thu Mar 3 23:09:38 2016 -0800
Committer: ggregory <gg...@apache.org>
Committed: Thu Mar 3 23:09:38 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/osgi/Activator.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/463c9ea4/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java
index be70b37..468df53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java
@@ -39,7 +39,7 @@ public final class Activator implements BundleActivator, SynchronousBundleListen
private static final Logger LOGGER = StatusLogger.getLogger();
- private final AtomicReference<BundleContext> context = new AtomicReference<>();
+ private final AtomicReference<BundleContext> contextRef = new AtomicReference<>();
@Override
public void start(final BundleContext context) throws Exception {
@@ -47,7 +47,7 @@ public final class Activator implements BundleActivator, SynchronousBundleListen
if (PropertiesUtil.getProperties().getStringProperty(Constants.LOG4J_CONTEXT_SELECTOR) == null) {
System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR, BundleContextSelector.class.getName());
}
- if (this.context.compareAndSet(null, context)) {
+ if (this.contextRef.compareAndSet(null, context)) {
context.addBundleListener(this);
// done after the BundleListener as to not miss any new bundle installs in the interim
scanInstalledBundlesForPlugins(context);
@@ -79,7 +79,7 @@ public final class Activator implements BundleActivator, SynchronousBundleListen
@Override
public void stop(final BundleContext context) throws Exception {
- this.context.compareAndSet(context, null);
+ this.contextRef.compareAndSet(context, null);
LogManager.shutdown();
}