From edf1c2c7e00e40ed631c59b95df588ebc74fe27c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 8 Sep 2015 22:22:27 -0700 Subject: [PATCH] GUAC-1335: Don't "ALWAYS" release connection groups ... they only need to be released when acquire fails. --- .../auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java index 0d4106ae5..94a5753d7 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java @@ -529,8 +529,9 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS } // Ensure connection group is always released if child acquire fails - finally { + catch (GuacamoleException e) { release(user, connectionGroup); + throw e; } // Connect to acquired child