Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.95.2.1 -r1.95.2.2
--- openacs-4/packages/acs-tcl/acs-tcl.info	15 Feb 2019 11:03:57 -0000	1.95.2.1
+++ openacs-4/packages/acs-tcl/acs-tcl.info	5 Jun 2019 10:26:31 -0000	1.95.2.2
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d24" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d24.apm">
+    <version name="5.10.0d25" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d25.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d24"/>
+        <provides url="acs-tcl" version="5.10.0d25"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d4"/>
         <requires url="acs-kernel" version="5.10.0d0"/>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-tcl/tcl/00-canisue-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v
diff -u -r1.126.2.4 -r1.126.2.5
--- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	28 Mar 2019 21:11:22 -0000	1.126.2.4
+++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl	5 Jun 2019 10:26:31 -0000	1.126.2.5
@@ -525,20 +525,10 @@
     return $pool
 }
 
+if {[acs::icanuse "ns_db currenthandles"]} {
 
-set useNsdbCurrentHandles 0
-try {
-    ns_db x
-} on error {errorMsg} {
-    if {"currenthandles," in [split $errorMsg " "]} {
-        ns_log notice "can use 'ns_db currenthandles'"
-        set useNsdbCurrentHandles 1
-    } else {
-        ns_log notice "cannot use 'ns_db currenthandles'"
-    }
-}
+    ns_log notice "... I can use 'ns_db currenthandles'"
 
-if {$useNsdbCurrentHandles} {
     #
     # This branch uses "ns_db currenthandles" to implement
     # "db_with_handle" instead of the old approach based on the global
@@ -738,6 +728,7 @@
     # This is the legacy branch without [ns_db currenthandles], using
     # the global state variables.
     #
+    ns_log notice "... cannot use 'ns_db currenthandles'"
 
     ad_proc -public db_with_handle {
         { -dbn "" }