Add Simple Pipe into j2slib core

zhourenjian · zhourenjian · commit be1b6d98ac10 · 2008-04-22T15:58:35.000Z
diff --git a/sources/net.sf.j2s.ajax/.classpath b/sources/net.sf.j2s.ajax/.classpath
@@ -6,6 +6,7 @@
 	<classpathentry kind="src" path="ajaxcore"/>
 	<classpathentry kind="src" path="ajaxswt"/>
 	<classpathentry kind="src" path="ajaxrpc"/>
+	<classpathentry kind="src" path="ajaxpipe"/>
 	<classpathentry kind="var" path="JAVAX_SERVLET"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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
@@ -141,12 +141,15 @@ protected void doPipe(final HttpServletResponse resp, String key, String type)
 			int size = vector.size();
 			if (size > 0) {
 				for (int i = size - 1; i >= 0; i--) {
+					SimpleSerializable ss = null;
 					/*
 					 * Still need to check vector size!
 					 * Maybe multiple pipe servlets! 
 					 */
-					if (vector.size() <= 0) break;
-					SimpleSerializable ss = vector.remove(0);
+					synchronized (vector) {
+						if (vector.size() <= 0) break;
+						ss = vector.remove(0);
+					}
 					if (ss == null) break; // terminating signal
 					output(writer, type, key, ss.serialize());
 					writer.flush();
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java
@@ -165,11 +165,24 @@ protected static String adjustRequestURL(String method, String url, String seria
 			port = 443;
 		} else {
 			port = window.location.port;
+			if (port != "") {
+				port = parseInt (port);
+			}
 		}
 	}
 	var loc = window.location;
+	var locPort = loc.port;
+	if (locPort == "") {
+		if ("http:" == loc.protocol) {
+			locPort = 80;
+		} else if ("https:" == loc.protocol) {
+			locPort = 443;
+		}
+	} else {
+		locPort = parseInt (locPort);
+	}
 	return (loc.host != host || loc.protocol != protocol
-			|| loc.port != port
+			|| locPort != port
 			|| loc.protocol == "file:");
 }
 return false; // ftp ...
diff --git a/sources/net.sf.j2s.ajax/plugin.xml b/sources/net.sf.j2s.ajax/plugin.xml
@@ -12,6 +12,9 @@
       <classpathVariableInitializer
             class="net.sf.j2s.ajax.AJAXVariableInitializer"
             variable="AJAX_RPC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_PIPE"/>
       <classpathVariableInitializer
             class="net.sf.j2s.ajax.AJAXVariableInitializer"
             variable="AJAX_CORE_SRC"/>
@@ -21,6 +24,9 @@
       <classpathVariableInitializer
             class="net.sf.j2s.ajax.AJAXVariableInitializer"
             variable="AJAX_RPC_SRC"/>
+      <classpathVariableInitializer
+            class="net.sf.j2s.ajax.AJAXVariableInitializer"
+            variable="AJAX_PIPE_SRC"/>
    </extension>
 
 </plugin>
