Our invocation adapters now expect success first.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@790 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -325,15 +325,11 @@ public class SceneDirector extends BasicDirector
|
||||
var pendingData :PendingData = _pendingData;
|
||||
// ship on over to the other server
|
||||
_wctx.getClient().moveToServer(hostname, ports, new ConfirmAdapter(
|
||||
function (reason :String) :void { // failed
|
||||
requestFailed(reason);
|
||||
},
|
||||
function () :void { // succeeded
|
||||
// resend our move request now that we're connected to the new server
|
||||
_pendingData = pendingData;
|
||||
sendMoveRequest();
|
||||
}
|
||||
));
|
||||
}, requestFailed));
|
||||
}
|
||||
|
||||
// from interface SceneService_SceneMoveListener
|
||||
|
||||
@@ -213,18 +213,18 @@ public class SpotSceneDirector extends BasicDirector
|
||||
|
||||
_pendingLoc = (loc.clone() as Location);
|
||||
var clist :ConfirmAdapter = new ConfirmAdapter(
|
||||
function (reason :String) :void {
|
||||
_pendingLoc = null;
|
||||
if (listener != null) {
|
||||
listener.requestFailed(new Error(reason));
|
||||
}
|
||||
},
|
||||
function () :void {
|
||||
_location = _pendingLoc;
|
||||
_pendingLoc = null;
|
||||
if (listener != null) {
|
||||
listener.requestCompleted(_location);
|
||||
}
|
||||
},
|
||||
function (reason :String) :void {
|
||||
_pendingLoc = null;
|
||||
if (listener != null) {
|
||||
listener.requestFailed(new Error(reason));
|
||||
}
|
||||
});
|
||||
_sservice.changeLocation(_wctx.getClient(), sceneId, loc, clist);
|
||||
}
|
||||
@@ -252,15 +252,15 @@ public class SpotSceneDirector extends BasicDirector
|
||||
log.info("Joining cluster [friend=" + froid + "].");
|
||||
|
||||
_sservice.joinCluster(_wctx.getClient(), froid, new ConfirmAdapter(
|
||||
function (reason :String) :void {
|
||||
if (listener != null) {
|
||||
listener.requestFailed(new Error(reason));
|
||||
}
|
||||
},
|
||||
function () :void {
|
||||
if (listener != null) {
|
||||
listener.requestCompleted(null);
|
||||
}
|
||||
},
|
||||
function (reason :String) :void {
|
||||
if (listener != null) {
|
||||
listener.requestFailed(new Error(reason));
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user