1. Fixing bug that SimplePipe/CompoundPipe is not stable and may generate lots of IFRAME elements.

zhourenjian · zhourenjian · commit 997419d82fb8 · 2009-03-26T15:02:16.000Z
2. Support SimpleSerializable to generate a much smaller serialized string by ignoring fields with default values.
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRequest.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeRequest.java
@@ -88,6 +88,9 @@ private static CompoundPipeRunnable createPipe(String id) {
 			@Override
 			public void ajaxOut() {
 				super.ajaxOut();
+				if (!pipeAlive) {
+					return; // Not setup yet!
+				}
 				for (int i = 0; i < pipes.length; i++) {
 					if (pipes[i] != null) {
 						pipes[i].pipeKey = pipeKey;
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
@@ -67,15 +67,13 @@ public boolean pipeSetup() {
 
 	@Override
 	public boolean isPipeLive() {
-		if (status < 3) { // connected
+		if (pipeAlive && status < 3) { // connected
 			return true; // still in starting status
 		}
 		if (super.isPipeLive()) {
 			for (int i = 0; i < pipes.length; i++) {
-				if (pipes[i] != null) {
-					if (pipes[i].isPipeLive()) {
-						return true;
-					}
+				if (pipes[i] != null && pipes[i].isPipeLive()) {
+					return true;
 				}
 			}
 		}
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeSession.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/CompoundPipeSession.java
@@ -51,6 +51,18 @@ public boolean pipeDestroy() {
 		return true;
 	}
 	
+	@Override
+	public void pipeFailed() {
+		SimplePipeRunnable pipe = SimplePipeHelper.getPipe(pipeKey);
+		if (pipe instanceof CompoundPipeRunnable) {
+			CompoundPipeRunnable cp = (CompoundPipeRunnable) pipe;
+			if (cp.status < 3) {
+				cp.status = 3; // connected but failed to create child pipe
+			}
+			updateStatus(false);
+		}
+	}
+
 	@Override
 	final public SimpleSerializable[] through(Object... args) {
 		CompoundSerializable[] cs = convert(args);
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java
@@ -472,9 +472,14 @@ static void pipeScript(SimplePipeRunnable runnable) { // xss
 	 * @param runnable
 	 * @param domain
 	 * @j2sNative
+var pipeKey = runnable.pipeKey;
+var ifrEl = document.getElementById (pipeKey);
+if (ifrEl != null) {
+	ifrEl.parentNode.removeChild (ifrEl);
+	ifrEl = null;
+}
 var ifr = document.createElement ("IFRAME");
 ifr.style.display = "none";
-var pipeKey = runnable.pipeKey;
 var spr = net.sf.j2s.ajax.SimplePipeRequest;
 var url = runnable.getPipeURL();
 var src = url + (url.indexOf('?') != -1 ? "&" : "?") 
@@ -855,8 +860,9 @@ static void ajaxPipe(final SimplePipeRunnable runnable) {
 		if ((!isXSS || isSubdomain) && pipeMode == MODE_PIPE_CONTINUUM)
 			/**
 			 * @j2sNative
-			 * var subdomain = net.sf.j2s.ajax.SimplePipeRequest.adjustSubdomain (isSubdomain);
-			 * net.sf.j2s.ajax.SimplePipeRequest.pipeContinuum (runnable, subdomain);
+			 * var spr = net.sf.j2s.ajax.SimplePipeRequest;
+			 * var subdomain = spr.adjustSubdomain (isSubdomain);
+			 * spr.pipeContinuum (runnable, subdomain);
 			 */
 		{
 			//pipeQuery(runnable, "continuum");
@@ -868,14 +874,13 @@ public void run() {
 		} else
 			/**
 			 * @j2sNative
-if (isXSS && isSubdomain
- 		&& net.sf.j2s.ajax.SimplePipeRequest.isSubdomainXSSSupported ()) {
-	var subdomain = net.sf.j2s.ajax.SimplePipeRequest.adjustSubdomain (isSubdomain);
-	net.sf.j2s.ajax.SimplePipeRequest.pipeSubdomainQuery (runnable, subdomain);
+var spr = net.sf.j2s.ajax.SimplePipeRequest;
+if (isXSS && isSubdomain && spr.isSubdomainXSSSupported ()) {
+	var subdomain = spr.adjustSubdomain (isSubdomain);
+	spr.pipeSubdomainQuery (runnable, subdomain);
 	return;
 }
 runnable.queryEnded = true;
-var spr = net.sf.j2s.ajax.SimplePipeRequest;
 (function (pipeFun, key, created) { // Function that simulate a thread
 	return function () {
 		var sph = net.sf.j2s.ajax.SimplePipeHelper;
@@ -1073,7 +1078,6 @@ public void run() {
 			try {
 				p.pipeXHRQuery (p.xhrHandle, method, url, data);
 			} catch (e) {
-				alert (e);
 				p.xhrHandle.onreadystatechange = function () {};
 				p.xhrHandle = null;
 				document.domain = p.parentDomain;
@@ -1090,8 +1094,8 @@ public void run() {
 			document.domain = p.parentDomain;
 			with (window.parent) {
 				runnable.pipeAlive = false;
-				runnable.pipeClosed();
-				net.sf.j2s.ajax.SimplePipeHelper.removePipe(p.key);
+				runnable.pipeClosed ();
+				net.sf.j2s.ajax.SimplePipeHelper.removePipe (p.key);
 				net.sf.j2s.ajax.SimplePipeRequest.pipeIFrameClean (p.key);
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -67,15 +67,13 @@ public boolean pipeSetup() {`
`67`	`67`
`68`	`68`	`@Override`
`69`	`69`	`public boolean isPipeLive() {`
`70`		`- if (status < 3) { // connected`
	`70`	`+ if (pipeAlive && status < 3) { // connected`
`71`	`71`	`return true; // still in starting status`
`72`	`72`	`}`
`73`	`73`	`if (super.isPipeLive()) {`
`74`	`74`	`for (int i = 0; i < pipes.length; i++) {`
`75`		`- if (pipes[i] != null) {`
`76`		`- if (pipes[i].isPipeLive()) {`
`77`		`- return true;`
`78`		`- }`
	`75`	`+ if (pipes[i] != null && pipes[i].isPipeLive()) {`
	`76`	`+ return true;`
`79`	`77`	`}`
`80`	`78`	`}`
`81`	`79`	`}`