Skip to content

Commit 0f46970

Browse files
author
zhourenjian
committed
Fixing bugs
1 parent 2f3b028 commit 0f46970

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

‎sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ public void run() {
10491049
var state = oThis.xhrHandle.readyState;
10501050
if (state == 4) {
10511051
var pipeData = oThis.xhrHandle.responseText;
1052-
oThis.xhrHandle.onreadystatechange = NullObject;
1052+
oThis.xhrHandle.onreadystatechange = null;
10531053
var pipe = oThis.runnable;
10541054
if (oThis.xhrHandle.status != 200 && pipe != null) {
10551055
oThis.xhrHandle = null;
@@ -1117,9 +1117,16 @@ public void run() {
11171117
var runnable = p.runnable;
11181118
if (runnable != null) {
11191119
if (runnable.pipeKey != p.key) {
1120-
net.sf.j2s.ajax.SimplePipeHelper.removePipe (p.key);
1121-
net.sf.j2s.ajax.SimplePipeRequest.pipeIFrameClean (p.key, p.pipeURL);
1122-
return;
1120+
var key = p.key;
1121+
var url = p.pipeURL;
1122+
with (window.parent) {
1123+
try {
1124+
net.sf.j2s.ajax.SimplePipeHelper.removePipe (key);
1125+
net.sf.j2s.ajax.SimplePipeRequest.pipeIFrameClean (key, url);
1126+
return;
1127+
} catch (e) {
1128+
}
1129+
}
11231130
}
11241131
var now = new Date ().getTime ();
11251132
var last = runnable.lastPipeDataReceived;
@@ -1133,12 +1140,13 @@ public void run() {
11331140
var method = null;
11341141
var url = null;
11351142
var data = null;
1143+
var key = p.key;
11361144
with (window.parent) {
11371145
try {
11381146
method = runnable.getPipeMethod ();
11391147
url = runnable.getPipeURL ();
11401148
var spr = net.sf.j2s.ajax.SimplePipeRequest;
1141-
data = spr.constructRequest(p.key, spr.PIPE_TYPE_QUERY, true);
1149+
data = spr.constructRequest(key, spr.PIPE_TYPE_QUERY, true);
11421150
} catch (e) {
11431151
}
11441152
}
@@ -1152,7 +1160,7 @@ public void run() {
11521160
p.pipeXHRQuery (p.xhrHandle, method, url, data);
11531161
p.lastXHR = new Date ().getTime ();
11541162
} catch (e) {
1155-
p.xhrHandle.onreadystatechange = NullObject;
1163+
p.xhrHandle.onreadystatechange = null;
11561164
p.xhrHandle = null;
11571165
document.domain = p.parentDomain;
11581166
runnable.queryEnded = true;
@@ -1162,11 +1170,13 @@ public void run() {
11621170
if (runnable.queryFailedRetries >= 3
11631171
|| now - last > 3 * p.pipeLiveNotifyInterval) {
11641172
document.domain = p.parentDomain;
1173+
var key = p.key;
1174+
var url = p.pipeURL;
11651175
with (window.parent) {
11661176
runnable.pipeAlive = false;
11671177
runnable.pipeClosed ();
1168-
net.sf.j2s.ajax.SimplePipeHelper.removePipe (p.key);
1169-
net.sf.j2s.ajax.SimplePipeRequest.pipeIFrameClean (p.key, p.pipeURL);
1178+
net.sf.j2s.ajax.SimplePipeHelper.removePipe (key);
1179+
net.sf.j2s.ajax.SimplePipeRequest.pipeIFrameClean (key, url);
11701180
}
11711181
} else {
11721182
window.setTimeout (arguments.callee, p.pipeQueryInterval);

0 commit comments

Comments
 (0)