You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2016/12/08 11:27:29 UTC
svn commit: r1773217 -
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
Author: jsedding
Date: Thu Dec 8 11:27:29 2016
New Revision: 1773217
URL: http://svn.apache.org/viewvc?rev=1773217&view=rev
Log:
trivial: minor cleanup and nullability annotations
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1773217&r1=1773216&r2=1773217&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java Thu Dec 8 11:27:29 2016
@@ -49,6 +49,8 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
+
/**
* The <code>CommonResourceResolverFactoryImpl</code> is a singleton
* implementing the shared/common functionality of all resource
@@ -84,14 +86,11 @@ public class CommonResourceResolverFacto
/** Background thread handling disposing of resource resolver instances. */
private final Thread refQueueThread;
- private boolean logResourceResolverClosing = false;
-
/**
* Create a new common resource resolver factory.
*/
public CommonResourceResolverFactoryImpl(final ResourceResolverFactoryActivator activator) {
this.activator = activator;
- this.logResourceResolverClosing = activator.shouldLogResourceResolverClosing();
this.refQueueThread = new Thread("Apache Sling Resource Resolver Finalizer Thread") {
@Override
@@ -115,6 +114,7 @@ public class CommonResourceResolverFacto
/**
* @see org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
*/
+ @Nonnull
@SuppressWarnings("deprecation")
@Override
public ResourceResolver getAdministrativeResourceResolver(final Map<String, Object> passedAuthenticationInfo)
@@ -137,6 +137,7 @@ public class CommonResourceResolverFacto
/**
* @see org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
*/
+ @Nonnull
@Override
public ResourceResolver getResourceResolver(final Map<String, Object> passedAuthenticationInfo)
throws LoginException {
@@ -364,6 +365,7 @@ public class CommonResourceResolverFacto
return this.activator.getResourceAccessSecurityTracker();
}
+ @Nonnull
@Override
public ResourceResolver getServiceResourceResolver(
final Map<String, Object> authenticationInfo) throws LoginException {
@@ -435,7 +437,7 @@ public class CommonResourceResolverFacto
}
public boolean shouldLogResourceResolverClosing() {
- return logResourceResolverClosing;
+ return activator.shouldLogResourceResolverClosing();
}
public ResourceProviderTracker getResourceProviderTracker() {