You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/01/28 08:10:49 UTC
svn commit: r1780634 -
/sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
Author: olli
Date: Sat Jan 28 08:10:49 2017
New Revision: 1780634
URL: http://svn.apache.org/viewvc?rev=1780634&view=rev
Log:
SLING-6493 Remove (sub) service user from JcrResourceBundleProvider
Modified:
sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
Modified: sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java?rev=1780634&r1=1780633&r2=1780634&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java (original)
+++ sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java Sat Jan 28 08:10:49 2017
@@ -75,8 +75,6 @@ public class JcrResourceBundleProvider i
private static final int DEFAULT_INVALIDATION_DELAY = 5000;
- private static final String SLING_I18N_USER = "sling-i18n";
-
@Property(value = "en")
private static final String PROP_DEFAULT_LOCALE = "locale.default";
@@ -107,7 +105,7 @@ public class JcrResourceBundleProvider i
/**
* The resource resolver used to access the resource bundles. This object is
- * retrieved from the {@link #resourceResolverFactory} using the {@link #SLING_I18N_USER} service user session.
+ * retrieved from the {@link #resourceResolverFactory} using the service user session.
*/
private ResourceResolver resourceResolver;
@@ -367,9 +365,7 @@ public class JcrResourceBundleProvider i
this.bundleContext = context;
invalidationDelay = PropertiesUtil.toLong(props.get(PROP_INVALIDATION_DELAY), DEFAULT_INVALIDATION_DELAY);
if (this.resourceResolverFactory != null) { // this is only null during test execution!
- Map<String, Object> authInfo = Collections.<String, Object>singletonMap(
- ResourceResolverFactory.SUBSERVICE, SLING_I18N_USER);
- resourceResolver = resourceResolverFactory.getServiceResourceResolver(authInfo);
+ resourceResolver = resourceResolverFactory.getServiceResourceResolver(null);
scheduleReloadBundles(false);
}