Commitf62923c

zhourenjian@gmail.com

committed

Synchronize on pipe object to initialize pipe data on #pipeCloneData

1 parent2dac2ea commitf62923cCopy full SHA for f62923c

File tree

-4

lines changed

sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax
- SimplePipeHelper.java
- SimplePipeRunnable.java

-4

lines changed

Lines changed: 1 addition & 3 deletions

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 &&sinstanceofISimplePipePriority) {`
`230`	`228`	`hasNewPriority =true;`
`231`	`229`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,11 @@ protected void pipeCloneData(SimplePipeRunnable anotherPipe, SimpleFilter filter`
`246`	`246`	`if (anotherPipe !=null &&anotherPipe.pipeData !=null &&anotherPipe.pipeData.size() >0) {`
`247`	`247`	`if (pipeData ==null) {`
`248`	`248`	`List<SimpleSerializable>data =newVector<SimpleSerializable>(anotherPipe.pipeData.size());`
`249`		`-pipeData =data;`
	`249`	`+synchronized (this) {`
	`250`	`+if (pipeData ==null) {`
	`251`	`+pipeData =data;`
	`252`	`+}`
	`253`	`+}`
`250`	`254`	`}`
`251`	`255`	`synchronized (pipeData) {`
`252`	`256`	`synchronized (anotherPipe.pipeData) {`

Comments

(0)