diff --git a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java index f465fd39a..21a84807d 100644 --- a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java +++ b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java @@ -38,14 +38,14 @@ import com.threerings.presents.peer.net.PeerCreds; import static com.threerings.presents.Log.log; /** - * Handles authentication of peer servers and passes non-peer authentication - * requests through to a normal authenticator. + * Handles authentication of peer servers and passes non-peer authentication requests through to a + * normal authenticator. */ public class PeerAuthenticator extends Authenticator { /** - * Creates an authenticator that will handle peer authentications and pass - * non-peer authentications through to the supplied delegate. + * Creates an authenticator that will handle peer authentications and pass non-peer + * authentications through to the supplied delegate. */ public PeerAuthenticator (PeerManager nodemgr, Authenticator delegate) { @@ -67,18 +67,8 @@ public class PeerAuthenticator extends Authenticator } } - @Override - protected Invoker getInvoker () - { - // The processing of peer authentication happens inline, - // but other authentication will use the _delegate which will - // probably use an Invoker. - return null; - } - // from abstract Authenticator - protected void processAuthentication ( - AuthingConnection conn, AuthResponse rsp) + protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) throws PersistenceException { // here, we are ONLY authenticating peers @@ -89,8 +79,7 @@ public class PeerAuthenticator extends Authenticator rsp.getData().code = AuthResponseData.SUCCESS; } else { - log.warning("Received invalid peer auth request? " + - "[creds=" + pcreds + "]."); + log.warning("Received invalid peer auth request? [creds=" + pcreds + "]."); rsp.getData().code = AuthCodes.SERVER_ERROR; } } diff --git a/src/java/com/threerings/presents/server/DummyAuthenticator.java b/src/java/com/threerings/presents/server/DummyAuthenticator.java index 61aea68f9..c18dcc17c 100644 --- a/src/java/com/threerings/presents/server/DummyAuthenticator.java +++ b/src/java/com/threerings/presents/server/DummyAuthenticator.java @@ -32,20 +32,12 @@ import com.threerings.presents.server.net.AuthingConnection; import static com.threerings.presents.Log.log; /** - * A simple authenticator implementation that simply accepts all - * authentication requests. + * A simple authenticator implementation that simply accepts all authentication requests. */ public class DummyAuthenticator extends Authenticator { - @Override - protected Invoker getInvoker () - { - return null; // not needed - } - // from abstract Authenticator - protected void processAuthentication ( - AuthingConnection conn, AuthResponse rsp) + protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) throws PersistenceException { log.info("Accepting request: " + conn.getAuthRequest()); diff --git a/src/java/com/threerings/presents/server/Rejector.java b/src/java/com/threerings/presents/server/Rejector.java index 39e0cba35..d577ed161 100644 --- a/src/java/com/threerings/presents/server/Rejector.java +++ b/src/java/com/threerings/presents/server/Rejector.java @@ -36,8 +36,8 @@ import com.threerings.presents.server.net.AuthingConnection; import static com.threerings.presents.Log.log; /** - * A simple server that does nothing more than spit out a canned error - * response to everyone who logs in. + * A simple server that does nothing more than spit out a canned error response to everyone who + * logs in. */ public class Rejector extends PresentsServer { @@ -80,20 +80,12 @@ public class Rejector extends PresentsServer } /** - * An authenticator implementation that refuses all authentication - * requests. + * An authenticator implementation that refuses all authentication requests. */ protected class RejectingAuthenticator extends Authenticator { - @Override - protected Invoker getInvoker () - { - return null; - } - // from abstract Authenticator - protected void processAuthentication ( - AuthingConnection conn, AuthResponse rsp) + protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) throws PersistenceException { log.info("Rejecting request: " + conn.getAuthRequest());