safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #269: Fix JavaDoc, use GuacamoleSocket (no need to require ConfiguredGuacamoleSocket).

Browse Source
This commit is contained in:
Michael Jumper
2013-02-23 12:54:16 -08:00
parent 7a7ead0c64
commit a7e894380d
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
View File

@@ -1,3 +1,6 @@
package net.sourceforge.guacamole.net.auth.mysql;
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
* *
@@ -33,14 +36,12 @@
* the terms of any one of the MPL, the GPL or the LGPL. * the terms of any one of the MPL, the GPL or the LGPL.
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
package net.sourceforge.guacamole.net.auth.mysql;
import com.google.inject.Inject; import com.google.inject.Inject;
import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.io.GuacamoleReader; import net.sourceforge.guacamole.io.GuacamoleReader;
import net.sourceforge.guacamole.io.GuacamoleWriter; import net.sourceforge.guacamole.io.GuacamoleWriter;
import net.sourceforge.guacamole.net.GuacamoleSocket; import net.sourceforge.guacamole.net.GuacamoleSocket;
import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
/** /**
* A MySQL specific wrapper around a ConfiguredGuacamoleSocket. * A MySQL specific wrapper around a ConfiguredGuacamoleSocket.
@@ -48,17 +49,31 @@ import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
*/ */
public class MySQLGuacamoleSocket implements GuacamoleSocket { public class MySQLGuacamoleSocket implements GuacamoleSocket {
/**
* Injected ActiveConnectionSet which will contain all active connections.
*/
@Inject @Inject
ActiveConnectionSet activeConnectionSet; ActiveConnectionSet activeConnectionSet;
private ConfiguredGuacamoleSocket socket; /**
* The wrapped socket.
*/
private GuacamoleSocket socket;
/**
* The ID associated with the connection associated with the wrapped
* socket.
*/
private int connectionID; private int connectionID;
/** /**
* Initialize this MySQLGuacamoleSocket with the provided ConfiguredGuacamoleSocket. * Initialize this MySQLGuacamoleSocket with the provided GuacamoleSocket.
* @param socket the ConfiguredGuacamoleSocket to wrap. *
* @param socket The ConfiguredGuacamoleSocket to wrap.
* @param connectionID The ID of the connection associated with the given
* socket.
*/ */
public void init(ConfiguredGuacamoleSocket socket, int connectionID) { public void init(GuacamoleSocket socket, int connectionID) {
this.socket = socket; this.socket = socket;
this.connectionID = connectionID; this.connectionID = connectionID;
} }
@@ -75,9 +90,13 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
@Override @Override
public void close() throws GuacamoleException { public void close() throws GuacamoleException {
// Close socket
socket.close(); socket.close();
//mark this connection as inactive
// Mark this connection as inactive
activeConnectionSet.remove(connectionID); activeConnectionSet.remove(connectionID);
} }
@Override @Override