AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Had to modify the way control is transferred to the dobjmgr thread during

Browse Source 
session resumption because the client is not subscribed to the client
object at that time. This way is cleaner anyway.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@185 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-08-04 03:26:00 +00:00
parent 897748bf57
commit 17135945d1
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/server/PresentsClient.java
+42 -37
View File
@@ -1,5 +1,5 @@
//
// $Id: PresentsClient.java,v 1.14 2001/08/04 01:54:34 mdb Exp $
// $Id: PresentsClient.java,v 1.15 2001/08/04 03:26:00 mdb Exp $
package com.threerings.cocktail.cher.server;
@@ -114,9 +114,38 @@ public class CherClient implements Subscriber, MessageHandler
// start using the new connection
setConnection(conn);
// we need to queue up an event so that we can finalize the
// resumption of the session on the dobjmgr thread
CherServer.omgr.postEvent(new ResumeSessionEvent(_clobj.getOid()));
// we need to get onto the distributed object thread so that we
// can finalize the resumption of the session. we do so by
// subscribing to the client object (to which we are normally not
// subscribed in between active connections)
Subscriber sub = new Subscriber() {
public void objectAvailable (DObject dobj)
{
// we don't want to continue to be subscribed to the
// client object so we remove our subscription
dobj.removeSubscriber(this);
// now that we're on the dobjmgr thread we can resume our
// session resumption
finishResumeSession();
}
public void requestFailed (int oid, ObjectAccessException cause)
{
Log.warning("Not able to subscribe to client object and " +
"resume session!? [client=" + CherClient.this +
", cause=" + cause + "].");
}
public boolean handleEvent (DEvent event, DObject target)
{
Log.warning("Resuming subscriber received an event!? " +
"[client=" + CherClient.this +
", event=" + event + "].");
// we shouldn't have been subscribed in the first place
return false;
}
};
CherServer.omgr.subscribeToObject(_clobj.getOid(), sub);
}
/**
@@ -313,22 +342,16 @@ public class CherClient implements Subscriber, MessageHandler
// documentation inherited from interface
public boolean handleEvent (DEvent event, DObject target)
{
if (event instanceof ResumeSessionEvent) {
finishResumeSession();
// forward the event to the client
Connection conn = getConnection();
if (conn != null) {
// only typed events will be forwarded to the client, so we
// need not worry that a non-typed event would make it here
TypedEvent tevent = (TypedEvent)event;
conn.postMessage(new EventNotification(tevent));
} else {
// forward the event to the client
Connection conn = getConnection();
if (conn != null) {
// only typed events will be forwarded to the client, so
// we need not worry that a non-typed event would make it
// here
TypedEvent tevent = (TypedEvent)event;
conn.postMessage(new EventNotification(tevent));
} else {
Log.info("Dropped event forward notification " +
"[client=" + this + ", event=" + event + "].");
}
Log.info("Dropped event forward notification " +
"[client=" + this + ", event=" + event + "].");
}
return true;
@@ -446,24 +469,6 @@ public class CherClient implements Subscriber, MessageHandler
}
}
/**
* Used to inject ourselves onto the dobjmgr thread.
*/
protected static class ResumeSessionEvent extends DEvent
{
public ResumeSessionEvent (int oid)
{
super(oid);
}
public boolean applyToObject (DObject target)
throws ObjectAccessException
{
// nothing to do here and don't tell our subscribers
return false;
}
}
protected ClientManager _cmgr;
protected String _username;
protected Connection _conn;