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

GUACAMOLE-102: Code cleanup - remove unused default parameters; improve commentary and use more standard variable names.

Browse Source
This commit is contained in:
Nick Couchman
2017-06-06 08:49:48 -04:00
parent 06e27d30ff
commit 2986c61690
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
View File

@@ -188,23 +188,23 @@ public class RestrictedGuacamoleTunnelService
public int compare(ModeledConnection a, ModeledConnection b) {
// Active connections
int Ca = getActiveConnections(a).size();
int Cb = getActiveConnections(b).size();
int connA = getActiveConnections(a).size();
int connB = getActiveConnections(b).size();
// Assigned weight
int Wa = a.getConnectionWeight();
int Wb = b.getConnectionWeight();
int weightA = a.getConnectionWeight();
int weightB = b.getConnectionWeight();
// Net weight of connections
int NWa = Ca * Wb;
int NWb = Cb * Wa;
// Calculated weight of connections
int calcWeightA = connA * weightB;
int calcWeightB = connB * weightA;
// If net weights are equal, return difference in weight
if (NWa == NWb)
return (Wa - Wb);
// If calculated weights are equal, return difference in assigned weight
if (calcWeightA == calcWeightB)
return (weightA - weightB);
// Return different in net weights
return (NWa - NWb);
// Return different in calculated weights
return (calcWeightA - calcWeightB);
}

12
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java
View File

@@ -174,18 +174,6 @@ public class MySQLGuacamoleProperties {
};
/**
* The connection weight for connections in balancing groups.
*/
public static final IntegerGuacamoleProperty
MYSQL_DEFAULT_CONNECTION_WEIGHT =
new IntegerGuacamoleProperty() {
@Override
public String getName() { return "mysql-default-connection-weight"; }
};
/**
* The maximum number of concurrent connections to allow to any one
* connection group by an individual user. Zero denotes

9
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLGuacamoleProperties.java
View File

@@ -157,15 +157,6 @@ public class PostgreSQLGuacamoleProperties {
};
public static final IntegerGuacamoleProperty
POSTGRESQL_DEFAULT_CONNECTION_WEIGHT =
new IntegerGuacamoleProperty() {
@Override
public String getName() { return "postgresql-default-connection-weight"; }
};
/**
* The maximum number of concurrent connections to allow to any one
* connection group. Zero denotes unlimited.