From f66bbd2e0f07e1dd15d15d94265eaadb87fbd888 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Mon, 5 Jun 2017 14:53:21 -0400
Subject: [PATCH] GUACAMOLE-102: Move null checking logic to ModeledConnection.

---
 .../guacamole/auth/jdbc/connection/ConnectionModel.java  | 6 ++----
 .../auth/jdbc/connection/ModeledConnection.java          | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

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 2da37a763..f208b5ac8 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;
     }
 
     /**
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 67bd7933c..7e11a762b 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;
 
     }