svn commit: r1624518 - in /sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl: NonCachingTemplateResolver.java ThymeleafScriptEngineFactory.java

[olli]

Author: olli
Date: Fri Sep 12 12:30:04 2014
New Revision: 1624518

URL: http://svn.apache.org/r1624518
Log:
make bind/unbind synchronized

Modified:
    
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/NonCachingTemplateResolver.java
    
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/ThymeleafScriptEngineFactory.java

Modified: 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/NonCachingTemplateResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/NonCachingTemplateResolver.java?rev=1624518&r1=1624517&r2=1624518&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/NonCachingTemplateResolver.java
 (original)
+++ 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/NonCachingTemplateResolver.java
 Fri Sep 12 12:30:04 2014
@@ -100,12 +100,12 @@ public class NonCachingTemplateResolver 
         logger.debug("deactivate");
     }
 
-    protected void bindTemplateModeHandlers(final SlingTemplateModeHandler 
templateModeHandler) {
+    protected synchronized void bindTemplateModeHandlers(final 
SlingTemplateModeHandler templateModeHandler) {
         logger.debug("binding template mode handler '{}'", 
templateModeHandler.getTemplateModeName());
         templateModeHandlers.add(templateModeHandler);
     }
 
-    protected void unbindTemplateModeHandlers(final SlingTemplateModeHandler 
templateModeHandler) {
+    protected synchronized void unbindTemplateModeHandlers(final 
SlingTemplateModeHandler templateModeHandler) {
         logger.debug("unbinding template mode handler '{}'", 
templateModeHandler.getTemplateModeName());
         templateModeHandlers.remove(templateModeHandler);
     }

Modified: 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/ThymeleafScriptEngineFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/ThymeleafScriptEngineFactory.java?rev=1624518&r1=1624517&r2=1624518&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/ThymeleafScriptEngineFactory.java
 (original)
+++ 
sling/trunk/contrib/scripting/thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/impl/ThymeleafScriptEngineFactory.java
 Fri Sep 12 12:30:04 2014
@@ -107,25 +107,25 @@ public class ThymeleafScriptEngineFactor
         templateEngine = null;
     }
 
-    protected void bindTemplateResolvers(final ITemplateResolver 
templateResolver) {
+    protected synchronized void bindTemplateResolvers(final ITemplateResolver 
templateResolver) {
         logger.debug("binding template resolver '{}'", 
templateResolver.getName());
         templateResolvers.add(templateResolver);
         configureTemplateEngine();
     }
 
-    protected void unbindTemplateResolvers(final ITemplateResolver 
templateResolver) {
+    protected synchronized void unbindTemplateResolvers(final 
ITemplateResolver templateResolver) {
         logger.debug("unbinding template resolver '{}'", 
templateResolver.getName());
         templateResolvers.remove(templateResolver);
         configureTemplateEngine();
     }
 
-    protected void bindMessageResolvers(final IMessageResolver 
messageResolver) {
+    protected synchronized void bindMessageResolvers(final IMessageResolver 
messageResolver) {
         logger.debug("binding message resolver '{}'", 
messageResolver.getName());
         messageResolvers.add(messageResolver);
         configureTemplateEngine();
     }
 
-    protected void unbindMessageResolvers(final IMessageResolver 
messageResolver) {
+    protected synchronized void unbindMessageResolvers(final IMessageResolver 
messageResolver) {
         logger.debug("unbinding message resolver '{}'", 
messageResolver.getName());
         messageResolvers.remove(messageResolver);
         configureTemplateEngine();