Update our AuthRequest on session resume so that we deliver the proper
bootstrap services. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4601 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -342,7 +342,7 @@ public class ClientManager
|
|||||||
if (client != null) {
|
if (client != null) {
|
||||||
Log.info("Resuming session [username=" + username +
|
Log.info("Resuming session [username=" + username +
|
||||||
", conn=" + conn + "].");
|
", conn=" + conn + "].");
|
||||||
client.resumeSession(conn);
|
client.resumeSession(req, conn);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Log.info("Session initiated [username=" + username +
|
Log.info("Session initiated [username=" + username +
|
||||||
|
|||||||
@@ -487,7 +487,7 @@ public class PresentsClient
|
|||||||
* Called by the client manager when a new connection arrives that authenticates as this
|
* Called by the client manager when a new connection arrives that authenticates as this
|
||||||
* already established client. This must only be called from the congmr thread.
|
* already established client. This must only be called from the congmr thread.
|
||||||
*/
|
*/
|
||||||
protected void resumeSession (Connection conn)
|
protected void resumeSession (AuthRequest req, Connection conn)
|
||||||
{
|
{
|
||||||
// check to see if we've already got a connection object, in which case it's probably stale
|
// check to see if we've already got a connection object, in which case it's probably stale
|
||||||
Connection oldconn = getConnection();
|
Connection oldconn = getConnection();
|
||||||
@@ -497,6 +497,9 @@ public class PresentsClient
|
|||||||
oldconn.close();
|
oldconn.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// note our new auth request (so that we can deliver the proper bootstrap services)
|
||||||
|
_areq = req;
|
||||||
|
|
||||||
// start using the new connection
|
// start using the new connection
|
||||||
setConnection(conn);
|
setConnection(conn);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user