GUACAMOLE-102: Move null checking logic to ModeledConnection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/f66bbd2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/f66bbd2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/f66bbd2e Branch: refs/heads/master Commit: f66bbd2e0f07e1dd15d15d94265eaadb87fbd888 Parents: f77c507 Author: Nick Couchman <[email protected]> Authored: Mon Jun 5 14:53:21 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Mon Jun 5 21:43:05 2017 -0400 ---------------------------------------------------------------------- .../guacamole/auth/jdbc/connection/ConnectionModel.java | 6 ++---- .../guacamole/auth/jdbc/connection/ModeledConnection.java | 9 ++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f66bbd2e/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java index 2da37a7..f208b5a 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionModel.java @@ -192,10 +192,8 @@ public class ConnectionModel extends ChildObjectModel { * negative numbers are used to indicate the system is * unavailable. */ - public int getConnectionWeight() { - if (connectionWeight == null) - return 1; - return connectionWeight.intValue(); + public Integer getConnectionWeight() { + return connectionWeight; } /** http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/f66bbd2e/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java index 67bd793..7e11a76 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java @@ -412,7 +412,8 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod } /** - * Returns the weight of the connection, or the default. + * Returns the weight of the connection, or a default + * of 1 if the weight is undefined. * * @return * The weight of the connection. @@ -420,8 +421,10 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod */ public int getConnectionWeight() { - // Return the connection weight - return getModel().getConnectionWeight(); + Integer connectionWeight = getModel().getConnectionWeight(); + if(connectionWeight == null) + return 1; + return connectionWeight; }
