Merge pull request ArcBees#281 from 5inGularity/master

Non-thread-safe usage of map can result in infinite loop and 100% CPU usage Former-commit-id: a802f81
hpehl · Jul 4, 2013 · 65d4976 · 65d4976
2 parents 2f05188 + 529b752
commit 65d4976
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.../dispatch/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java b/.../dispatch/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
@@ -16,13 +16,14 @@
 
 package com.gwtplatform.dispatch.server.guice.actionhandlervalidator;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import com.google.inject.Injector;
+import com.gwtplatform.dispatch.server.actionhandler.ActionHandler;
 import com.gwtplatform.dispatch.server.actionhandlervalidator.ActionHandlerValidatorClass;
 import com.gwtplatform.dispatch.server.actionhandlervalidator.ActionHandlerValidatorInstance;
 import com.gwtplatform.dispatch.server.actionhandlervalidator.LazyActionHandlerValidatorRegistry;
@@ -50,10 +51,10 @@ public class LazyActionHandlerValidatorRegistryImpl implements
     @Inject
     LazyActionHandlerValidatorRegistryImpl(Injector injector) {
         this.injector = injector;
-        actionHandlerValidatorClasses = new HashMap<Class<? extends Action<?>>, ActionHandlerValidatorClass<? extends
+        actionHandlerValidatorClasses = new ConcurrentHashMap<Class<? extends Action<?>>, ActionHandlerValidatorClass<? extends
                 Action<?>, ? extends Result>>();
-        actionHandlerValidatorInstances = new HashMap<Class<? extends Action<?>>, ActionHandlerValidatorInstance>();
-        validators = new HashMap<Class<? extends ActionValidator>, ActionValidator>();
+        actionHandlerValidatorInstances = new ConcurrentHashMap<Class<? extends Action<?>>, ActionHandlerValidatorInstance>();
+        validators = new ConcurrentHashMap<Class<? extends ActionValidator>, ActionValidator>();
     }
 
     @Override

diff --git a/...dispatch/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java b/...dispatch/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
@@ -16,8 +16,8 @@
 
 package com.gwtplatform.dispatch.server.spring.actionhandlervalidator;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -46,10 +46,10 @@ public class LazyActionHandlerValidatorRegistryImpl implements LazyActionHandler
     private final Map<Class<? extends ActionValidator>, ActionValidator> validators;
 
     public LazyActionHandlerValidatorRegistryImpl() {
-        actionHandlerValidatorClasses = new HashMap<Class<? extends Action<?>>, ActionHandlerValidatorClass<? extends
+        actionHandlerValidatorClasses = new ConcurrentHashMap<Class<? extends Action<?>>, ActionHandlerValidatorClass<? extends
                 Action<?>, ? extends Result>>();
-        actionHandlerValidatorInstances = new HashMap<Class<? extends Action<?>>, ActionHandlerValidatorInstance>();
-        validators = new HashMap<Class<? extends ActionValidator>, ActionValidator>();
+        actionHandlerValidatorInstances = new ConcurrentHashMap<Class<? extends Action<?>>, ActionHandlerValidatorInstance>();
+        validators = new ConcurrentHashMap<Class<? extends ActionValidator>, ActionValidator>();
     }
 
     @Override