From 32b27a99c8078fc79ca1377fb88adcc4e638855c Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Wed, 31 Aug 2022 15:39:22 -0700
Subject: [PATCH 1/2] Check whether 'labkey.xml' change broke jTDS support

---
 webapps/labkey.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapps/labkey.xml b/webapps/labkey.xml
index 0e0bd74fb8..34729f0906 100644
--- a/webapps/labkey.xml
+++ b/webapps/labkey.xml
@@ -8,14 +8,10 @@
         driverClassName="@@jdbcDriverClassName@@"
         url="@@jdbcURL@@"
         maxTotal="20"
-        maxIdle="3"
-        minIdle="1"
+        maxIdle="10"
         maxWaitMillis="120000"
-        testOnBorrow="false"
-        testWhileIdle="true"
-        timeBetweenEvictionRunsMillis="300000"
-        minEvictableIdleTimeMillis="300000"
         accessToUnderlyingConnectionAllowed="true"
+        validationQuery="SELECT 1"
         />
 
     <Resource name="mail/Session" auth="Container"

From 1c1dc04eee938184bab75d4ea4ef1e61952c733f Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Wed, 31 Aug 2022 16:35:18 -0700
Subject: [PATCH 2/2] Reintroduce 'validationQuery' for jTDS support

---
 webapps/labkey.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapps/labkey.xml b/webapps/labkey.xml
index 34729f0906..1ac44b02dd 100644
--- a/webapps/labkey.xml
+++ b/webapps/labkey.xml
@@ -8,8 +8,13 @@
         driverClassName="@@jdbcDriverClassName@@"
         url="@@jdbcURL@@"
         maxTotal="20"
-        maxIdle="10"
+        maxIdle="3"
+        minIdle="1"
         maxWaitMillis="120000"
+        testOnBorrow="false"
+        testWhileIdle="true"
+        timeBetweenEvictionRunsMillis="300000"
+        minEvictableIdleTimeMillis="300000"
         accessToUnderlyingConnectionAllowed="true"
         validationQuery="SELECT 1"
         />