Fixing bug that message is being discarded without being received

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 62d8721d4809 · 2013-11-13T19:27:36.000Z
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
@@ -313,6 +313,8 @@ public void run() {
 						SimplePipeRunnable r = SimplePipeHelper.getPipe(p.pipeKey);
 						if (r == null || !r.isPipeLive()) {
 							if (now - p.lastLiveDetected > p.pipeWaitClosingInterval()) {
+								p.pipeDestroy(); // Pipe's server side destroying
+								p.pipeClosed(); // Pipe's client side closing
 								synchronized (notifyingMutex) {
 									notifyingPipes.remove(p);
 								}
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
@@ -66,7 +66,7 @@ public abstract class SimplePipeRunnable extends SimpleRPCRunnable {
 	long notifySequence = 1;
 	
 	@J2SIgnore
-	int sequenceIndex; // Index of last SimplePipeSequence in pipeData 
+	int sequenceIndex; // Index of first SimplePipeSequence in pipeData 
 	
 	@J2SIgnore
 	int bufferedIndex; // Index of last buffered object in pipeData, data before this object is sent 
@@ -110,12 +110,12 @@ public List<SimpleSerializable> getPipeData() {
 	}
 
 	@J2SIgnore
-	public void setLastPipeSequenceIndex(int index) {
+	public void setFirstPipeSequenceIndex(int index) {
 		sequenceIndex = index;
 	}
 	
 	@J2SIgnore
-	public int getLastPipeSequenceIndex() {
+	public int getFirstPipeSequenceIndex() {
 		return sequenceIndex;
 	}
 	
@@ -139,6 +139,11 @@ public void setSequence(long sequence) {
 		pipeSequence = sequence;
 	}
 
+	/**
+	 * Monitoring to see if all events has been received and call #pipeDataOK.
+	 * 
+	 * @return
+	 */
 	@J2SIgnore
 	public boolean isMonitoringEvents() {
 		return false;
@@ -308,6 +313,15 @@ public void pipeFailed() {
 		pipeDestroy();
 	}
 	
+	/**
+	 * Pipe is connected.
+	 * For server side, client has already connected to server.
+	 * For client side, server has responded.
+	 */
+	public void pipeConnected() {
+		
+	}
+	
 	/**
 	 * The pipe is lost. Reasons may be server is down, physical connection
 	 * is broken or client side failed to keep pipe alive.

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,8 @@ public void run() {`
`313`	`313`	`SimplePipeRunnable r = SimplePipeHelper.getPipe(p.pipeKey);`
`314`	`314`	`if (r == null \|\| !r.isPipeLive()) {`
`315`	`315`	`if (now - p.lastLiveDetected > p.pipeWaitClosingInterval()) {`
	`316`	`+ p.pipeDestroy(); // Pipe's server side destroying`
	`317`	`+ p.pipeClosed(); // Pipe's client side closing`
`316`	`318`	`synchronized (notifyingMutex) {`
`317`	`319`	`notifyingPipes.remove(p);`
`318`	`320`	`}`