Synchronize on pipe object to initialize pipe data on #pipeCloneData

zhourenjian@gmail.com · zhourenjian@gmail.com · commit f62923c80b1b · 2014-06-24T18:12:50.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHelper.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHelper.java
@@ -222,10 +222,8 @@ public static void pipeIn(String key, SimpleSerializable[] ss) {
 						}
 					}
 					c.setCached(true);
-					list.add(s);
-				} else {
-					list.add(s);
 				}
+				list.add(s);
 				if (!hasNewPriority && s instanceof ISimplePipePriority) {
 					hasNewPriority = true;
 				}
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRunnable.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRunnable.java
@@ -246,7 +246,11 @@ protected void pipeCloneData(SimplePipeRunnable anotherPipe, SimpleFilter filter
 		if (anotherPipe != null && anotherPipe.pipeData != null && anotherPipe.pipeData.size() > 0) {
 			if (pipeData == null) {
 				List<SimpleSerializable> data = new Vector<SimpleSerializable>(anotherPipe.pipeData.size());
-				pipeData = data;
+				synchronized (this) {
+					if (pipeData == null) {
+						pipeData = data;
+					}
+				}
 			}
 			synchronized (pipeData) {
 				synchronized (anotherPipe.pipeData) {

Original file line number	Diff line number	Diff line change
`@@ -222,10 +222,8 @@ public static void pipeIn(String key, SimpleSerializable[] ss) {`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`c.setCached(true);`
`225`		`- list.add(s);`
`226`		`- } else {`
`227`		`- list.add(s);`
`228`	`225`	`}`
	`226`	`+ list.add(s);`
`229`	`227`	`if (!hasNewPriority && s instanceof ISimplePipePriority) {`
`230`	`228`	`hasNewPriority = true;`
`231`	`229`	`}`