commit b7095f214d16b1b25b4300a9b2ac4171d9e8d6fa
author Carsten Ziegeler <cziegeler@apache.org> Wed Dec 14 07:21:46 2016 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Dec 14 07:21:46 2016 +0000
tree a0e01a41ac3dd036b7213cd3f8c21f4e0e1193cc
parent 9125f188703d8a71d93222ddc600c8057ec6c4d2

SLING-6395 : Reduce cost of JcrResourceBundleProvider.onChange(). Apply patch from Marcel Reutegger

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/i18n@1774128 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java

diff --git a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
index abd5e0d..d0a45e8 100644
--- a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
+++ b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
@@ -182,6 +182,7 @@
 
     @Override
     public void onChange(List<ResourceChange> changes) {
+        boolean refreshed = false;
         for(final ResourceChange change : changes) {
             log.trace("handleEvent: Detecting event {} for path '{}'", change.getType(), change.getPath());
 
@@ -211,6 +212,11 @@
                     }
                 }
                 // may be a completely new dictionary
+                if (!refreshed) {
+                    // refresh at most once per onChange()
+                    resourceResolver.refresh();
+                    refreshed = true;
+                }
                 if (isDictionaryResource(change)) {
                     scheduleReloadBundles(true);
                 }
@@ -223,7 +229,6 @@
         // therefore only consider changes either for sling:MessageEntry's
         // or for JSON dictionaries
         // get valuemap
-        resourceResolver.refresh();
         final Resource resource = resourceResolver.getResource(change.getPath());
         if (resource == null) {
             log.trace("Could not get resource for '{}' for event {}", change.getPath(), change.getType());