From e3f24f2f79719bc820dea5631d9fa3d7298765be Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 17 Mar 2016 13:01:48 -0700 Subject: [PATCH] GUAC-1512: Refer to defaults as defaults. --- .../guacamole/net/auth/mysql/MySQLEnvironment.java | 4 ++-- .../guacamole/auth/postgresql/PostgreSQLEnvironment.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java index 4cf474b9a..e54f2a9de 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLEnvironment.java @@ -55,7 +55,7 @@ public class MySQLEnvironment extends JDBCEnvironment { * The default value for the maximum number of connections to be * allowed to the Guacamole server overall. */ - private final int ABSOLUTE_MAX_CONNECTIONS = 0; + private final int DEFAULT_ABSOLUTE_MAX_CONNECTIONS = 0; /** * The default value for the default maximum number of connections to be @@ -173,7 +173,7 @@ public class MySQLEnvironment extends JDBCEnvironment { @Override public int getAbsoluteMaxConnections() throws GuacamoleException { return getProperty(MySQLGuacamoleProperties.MYSQL_ABSOLUTE_MAX_CONNECTIONS, - ABSOLUTE_MAX_CONNECTIONS + DEFAULT_ABSOLUTE_MAX_CONNECTIONS ); } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java index a87ffecc6..eddc84e7b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/glyptodon/guacamole/auth/postgresql/PostgreSQLEnvironment.java @@ -54,7 +54,7 @@ public class PostgreSQLEnvironment extends JDBCEnvironment { * The default value for the maximum number of connections to be * allowed to the Guacamole server overall. */ - private final int ABSOLUTE_MAX_CONNECTIONS = 0; + private final int DEFAULT_ABSOLUTE_MAX_CONNECTIONS = 0; /** * The default value for the default maximum number of connections to be @@ -172,7 +172,7 @@ public class PostgreSQLEnvironment extends JDBCEnvironment { @Override public int getAbsoluteMaxConnections() throws GuacamoleException { return getProperty(PostgreSQLGuacamoleProperties.POSTGRESQL_ABSOLUTE_MAX_CONNECTIONS, - ABSOLUTE_MAX_CONNECTIONS + DEFAULT_ABSOLUTE_MAX_CONNECTIONS ); }