Fixing bug that Simple Pipe may be broken on "maximized query items" break

zhourenjian · zhourenjian · commit 32a29b61bd0f · 2009-09-01T13:35:46.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRunnable.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRunnable.java
@@ -131,6 +131,16 @@ public void keepPipeLive() {
 		}
 	}
 
+	@Override
+	protected void updateStatus(boolean live) {
+		for (int i = 0; i < pipes.length; i++) {
+			if (pipes[i] != null) {
+				pipes[i].updateStatus(live);
+			}
+		}
+		super.updateStatus(live);
+	}
+
 	public boolean weave(CompoundPipeSession pipe) {
 		pipe.pipeReset();
 		synchronized (pipes) {
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeHttpServlet.java
@@ -209,6 +209,7 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 
 		long lastPipeDataWritten = -1;
 		long beforeLoop = System.currentTimeMillis();
+		int items = 0;
 		if (SimplePipeHelper.notifyPipeStatus(key, true)) { // update it!
 			List<SimpleSerializable> list = null;
 			int priority = 0;
@@ -218,7 +219,6 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 	        if (pipe != null) {
 	        	waitClosingInterval = pipe.pipeWaitClosingInterval();
 	        }
-	        int items = 0;
 			while ((list = SimplePipeHelper.getPipeDataList(key)) != null
 					/* && SimplePipeHelper.isPipeLive(key) */ // check it!
 					&& !writer.checkError()) {
@@ -279,7 +279,8 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 				if ((lastPipeDataWritten == -1 && now - beforeLoop >= pipeQueryTimeout)
 						|| (lastPipeDataWritten > 0
 								&& now - lastPipeDataWritten >= pipeQueryTimeout
-								&& SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type))) {
+								&& (SimplePipeRequest.PIPE_TYPE_CONTINUUM.equals(type)
+										|| SimplePipeRequest.PIPE_TYPE_SCRIPT.equals(type)))) {
 					output(writer, type, key, SimplePipeRequest.PIPE_STATUS_OK);
 					lastPipeDataWritten = System.currentTimeMillis();
 				}
@@ -316,7 +317,8 @@ protected void doPipe(final HttpServletResponse resp, String key, String type, S
 				// HTTP connection may be closed already!
 			}
 		} else if (SimplePipeRequest.PIPE_TYPE_SCRIPT.equals(type)
-				&& System.currentTimeMillis() - beforeLoop >= pipeScriptBreakout) {
+				&& (System.currentTimeMillis() - beforeLoop >= pipeScriptBreakout
+						|| (pipeMaxItemsPerQuery > 0 && items >= pipeMaxItemsPerQuery))) {
 			try {
 				output(writer, type, key, SimplePipeRequest.PIPE_STATUS_CONTINUE);
 				lastPipeDataWritten = System.currentTimeMillis();
