From 83a8e8223e9453f3928963f0cf1d901de182ac44 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Mon, 20 Mar 2017 09:06:04 -0400
Subject: [PATCH] GUACAMOLE-102: Tweak algorithm for computing the WLC vlaues.

---
 .../jdbc/connection/ModeledConnection.java     | 13 +++----------
 .../RestrictedGuacamoleTunnelService.java      | 18 +++++-------------
 2 files changed, 8 insertions(+), 23 deletions(-)

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 aa79ba435..1044a6202 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
@@ -416,19 +416,12 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
      * @return
      *     The weight of the connection.
      *  
-     * @throws GuacamoleException
-     *     If an error occurs while parsing the concurrency limit properties
-     *     specified within guacamole.properties.
      */
-    public int getConnectionWeight() throws GuacamoleException {
+    public int getConnectionWeight() {
 
-        // Pull default from environment if weight is unset
-        Integer value = getModel().getConnectionWeight();
-        if (value == null)
-            return environment.getDefaultConnectionWeight();
+        // Return the connection weight
+        return getModel().getConnectionWeight();
 
-        // Otherwise use defined value
-        return value;
     }
 
 }
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
index 92cdfc6b1..ae7a059dd 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/RestrictedGuacamoleTunnelService.java
@@ -192,21 +192,13 @@ public class RestrictedGuacamoleTunnelService
                 
                 logger.trace("Comparing {} to {}.", a.getName(), b.getName());
                 int cw = 0;
+                int weightA = a.getConnectionWeight();
+                int weightB = b.getConnectionWeight();
+                int connsA = getActiveConnections(a).size();
+                int connsB = getActiveConnections(b).size();
 
-                try {
-                    if(a.getConnectionWeight() > 0 && b.getConnectionWeight() > 0)
-                        cw = (int)(a.getConnectionWeight()/getActiveConnections(a).size() - b.getConnectionWeight()/getActiveConnections(b).size());
-                    else
-                        cw = getActiveConnections(a).size() - getActiveConnections(b).size();
+                return (connsA * 10000 / weightA) - (connsB * 10000 / weightB);
 
-                }
-                catch (GuacamoleException e) {
-                    logger.error("Could not compare connections.", e.getMessage());
-                    logger.debug("Could not compare connections.", e);
-                }
-
-                return cw;
-            
             }
 
         });