Merge patch branch changes to main.

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java

@@ -343,15 +343,13 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
         // Translate connection limit attribute
         try { getModel().setMaxConnections(NumericField.parse(attributes.get(MAX_CONNECTIONS_NAME))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting maximum connections: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting maximum connections: {}", e.getMessage(), e);
         }
 
         // Translate per-user connection limit attribute
         try { getModel().setMaxConnectionsPerUser(NumericField.parse(attributes.get(MAX_CONNECTIONS_PER_USER_NAME))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting maximum connections per user: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting maximum connections per user: {}", e.getMessage(), e);
         }
 
         // Translate guacd hostname
@@ -360,8 +358,7 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
         // Translate guacd port
         try { getModel().setProxyPort(NumericField.parse(attributes.get(GUACD_PORT_NAME))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting guacd port: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting guacd port: {}", e.getMessage(), e);
         }
 
         // Translate guacd encryption method
@@ -382,8 +379,7 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
         // Translate connection weight attribute
         try { getModel().setConnectionWeight(NumericField.parse(attributes.get(CONNECTION_WEIGHT))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting the connection weight: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting the connection weight: {}", e.getMessage(), e);
         }
 
         // Translate failover-only attribute

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connectiongroup/ModeledConnectionGroup.java

@@ -200,15 +200,13 @@ public class ModeledConnectionGroup extends ModeledChildDirectoryObject<Connecti
         // Translate connection limit attribute
         try { getModel().setMaxConnections(NumericField.parse(attributes.get(MAX_CONNECTIONS_NAME))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting maximum connections: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting maximum connections: {}", e.getMessage(), e);
         }
 
         // Translate per-user connection limit attribute
         try { getModel().setMaxConnectionsPerUser(NumericField.parse(attributes.get(MAX_CONNECTIONS_PER_USER_NAME))); }
         catch (NumberFormatException e) {
-            logger.warn("Not setting maximum connections per user: {}", e.getMessage());
-            logger.debug("Unable to parse numeric attribute.", e);
+            logger.warn("Not setting maximum connections per user: {}", e.getMessage(), e);
         }
 
         // Translate session affinity attribute

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java

@@ -778,8 +778,9 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
             // If connection failed due to an upstream error, retry other
             // connections
             catch (GuacamoleUpstreamException e) {
-                logger.info("Upstream error intercepted for connection \"{}\". Failing over to next connection in group...", connection.getIdentifier());
-                logger.debug("Upstream remote desktop reported an error during connection.", e);
+                logger.info("Upstream error intercepted for connection \"{}\". "
+                        + "Failing over to next connection in group...",
+                        connection.getIdentifier(), e);
                 connections.remove(connection);
                 upstreamHasFailed = true;
             }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java

@@ -442,8 +442,7 @@ public class ModeledUser extends ModeledPermissions<UserModel> implements User {
         if (attributes.containsKey(ACCESS_WINDOW_START_ATTRIBUTE_NAME)) {
             try { getModel().setAccessWindowStart(parseTime(attributes.get(ACCESS_WINDOW_START_ATTRIBUTE_NAME))); }
             catch (ParseException e) {
-                logger.warn("Not setting start time of user access window: {}", e.getMessage());
-                logger.debug("Unable to parse time attribute.", e);
+                logger.warn("Not setting start time of user access window: {}", e.getMessage(), e);
             }
         }
 
@@ -451,8 +450,7 @@ public class ModeledUser extends ModeledPermissions<UserModel> implements User {
         if (attributes.containsKey(ACCESS_WINDOW_END_ATTRIBUTE_NAME)) {
             try { getModel().setAccessWindowEnd(parseTime(attributes.get(ACCESS_WINDOW_END_ATTRIBUTE_NAME))); }
             catch (ParseException e) {
-                logger.warn("Not setting end time of user access window: {}", e.getMessage());
-                logger.debug("Unable to parse time attribute.", e);
+                logger.warn("Not setting end time of user access window: {}", e.getMessage(), e);
             }
         }
 
@@ -460,8 +458,7 @@ public class ModeledUser extends ModeledPermissions<UserModel> implements User {
         if (attributes.containsKey(VALID_FROM_ATTRIBUTE_NAME)) {
             try { getModel().setValidFrom(parseDate(attributes.get(VALID_FROM_ATTRIBUTE_NAME))); }
             catch (ParseException e) {
-                logger.warn("Not setting user validity start date: {}", e.getMessage());
-                logger.debug("Unable to parse date attribute.", e);
+                logger.warn("Not setting user validity start date: {}", e.getMessage(), e);
             }
         }
 
@@ -469,8 +466,7 @@ public class ModeledUser extends ModeledPermissions<UserModel> implements User {
         if (attributes.containsKey(VALID_UNTIL_ATTRIBUTE_NAME)) {
             try { getModel().setValidUntil(parseDate(attributes.get(VALID_UNTIL_ATTRIBUTE_NAME))); }
             catch (ParseException e) {
-                logger.warn("Not setting user validity end date: {}", e.getMessage());
-                logger.debug("Unable to parse date attribute.", e);
+                logger.warn("Not setting user validity end date: {}", e.getMessage(), e);
             }
         }
 

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUserContext.java

@@ -325,13 +325,9 @@ public class ModeledUserContext extends RestrictedObject
         }
 
         catch (GuacamoleException e) {
-
-            logger.warn(
-                    "Unable to determine if access window enforcement is"
-                    + " enabled for active sessions; enforcing by default: {}"
-                    , e.getMessage());
-            logger.debug("Unable to determine access window enforcement policy.", e);
-
+            logger.warn("Unable to determine if access window enforcement is"
+                    + " enabled for active sessions; enforcing by default: {}",
+                    e.getMessage(), e);
         }
 
         // A user context is valid if the associated user's account is valid