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

GUAC-1132: For consistency, rename getActiveSocket() to getSocket().

Browse Source
This commit is contained in:
Michael Jumper
2015-03-17 12:13:58 -07:00
parent f9bb25fdb2
commit 129bb688f4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ModeledConnectionRecord.java
View File

@@ -84,7 +84,7 @@ public class ModeledConnectionRecord implements ConnectionRecord {
} }
@Override @Override
public GuacamoleSocket getActiveSocket() { public GuacamoleSocket getSocket() {
return null; return null;
} }

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java
View File

@@ -389,7 +389,7 @@ public abstract class AbstractGuacamoleSocketService implements GuacamoleSocketS
); );
// Assign and return new socket // Assign and return new socket
activeConnection.setActiveSocket(socket); activeConnection.setSocket(socket);
return socket; return socket;
} }

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java
View File

@@ -194,7 +194,7 @@ public class ActiveConnectionRecord implements ConnectionRecord {
} }
@Override @Override
public GuacamoleSocket getActiveSocket() { public GuacamoleSocket getSocket() {
return socket; return socket;
} }
@@ -204,7 +204,7 @@ public class ActiveConnectionRecord implements ConnectionRecord {
* @param socket * @param socket
* The GuacamoleSocket to associate with this connection record. * The GuacamoleSocket to associate with this connection record.
*/ */
public void setActiveSocket(GuacamoleSocket socket) { public void setSocket(GuacamoleSocket socket) {
this.socket = socket; this.socket = socket;
} }

2
guacamole-ext/src/main/java/org/glyptodon/guacamole/net/auth/ConnectionRecord.java
View File

@@ -96,6 +96,6 @@ public interface ConnectionRecord {
* The connected GuacamoleSocket, if any, or null if the connection is * The connected GuacamoleSocket, if any, or null if the connection is
* not active or permission is denied. * not active or permission is denied.
*/ */
public GuacamoleSocket getActiveSocket(); public GuacamoleSocket getSocket();
} }