添加并发控制

mpush-tools/src/main/java/com/shinemo/mpush/tools/spi/ServiceContainer.java

@@ -53,8 +53,13 @@ public static <T> T getInstance(Class<T> clazz) {
 	public static <T> List<T> getInstances(Class<T> clazz){
 		ConcurrentMap<String, Object> objMap = objectsCachedMap.get(clazz);
 		if (objMap == null) {
-			objMap = Maps.newConcurrentMap();
-			objectsCachedMap.put(clazz, objMap);
+			synchronized (clazz) {
+				objMap = objectsCachedMap.get(clazz);
+				if(objMap == null){
+					objMap = Maps.newConcurrentMap();
+					objectsCachedMap.put(clazz, objMap);
+				}
+			}
 		}
 		objMap = objectsCachedMap.get(clazz);
 		if(!objMap.isEmpty()){
@@ -69,11 +74,9 @@ public static <T> List<T> getInstances(Class<T> clazz){
 		if (!clazzMap.isEmpty()) { //防止一个实例对象被初始化多次
 			synchronized (clazz) {
 				try {
-
 					if(!objMap.isEmpty()){
 						return Lists.newArrayList((List<T>)objMap.values());
 					}
-
 					Iterator<Entry<String, Class<?>>> iter = clazzMap.entrySet().iterator();
 					while (iter.hasNext()) {
 						Entry<String, Class<?>> entry = iter.next();
@@ -205,7 +208,13 @@ private static void loadFile(Class<?> type) {
 		} catch (Throwable t) {
 			log.error("", "Exception when load extension class(interface: " + type + ", description file: " + fileName + ").", t);
 		}
-		clazzCacheMap.put(type, map);
+		synchronized (type) {
+			Map<String, Class<?>> oldMap = clazzCacheMap.get(type);
+			if(oldMap==null){
+				clazzCacheMap.put(type, map);
+			}
+		}
+
 	}
 
 	public static String toLowerCaseFirstOne(String s) {

mpush-tools/src/test/java/com/shinemo/mpush/tools/spi/SpiTest.java

@@ -1,13 +1,42 @@
 package com.shinemo.mpush.tools.spi;
 
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
 import com.shinemo.mpush.tools.spi.test.TestService;
 
+
 public class SpiTest {
 
-	public static void main(String[] args) {
+	private static Executor pool = Executors.newCachedThreadPool();
+
+	@Ignore
+	@Test
+	public void baseTest(){
 		TestService testService = ServiceContainer.getInstance(TestService.class);
 		System.out.println(testService.sayHi(" huang"));
 	}
+
+	@Test
+	public void mulThreadTest() throws InterruptedException{
+		pool.execute(new Worker());
+		pool.execute(new Worker());
+		Thread.sleep(Integer.MAX_VALUE);
+	}
+
 
+	private static final class Worker implements Runnable{
+
+		@Override
+		public void run() {
+			TestService testService = ServiceContainer.getInstance(TestService.class);
+			System.out.println(testService.sayHi(" huang"));
+		}
+
+	}
+
 }