From 3c771110e317a62170c384070f805ec2e4b4399f Mon Sep 17 00:00:00 2001
From: Matthew Buckett <buckett@bumph.org>
Date: Mon, 21 May 2018 22:59:55 +0100
Subject: [PATCH] SAK-40012 Remove the longDataSource (#5605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This used to be used to separate file uploads/downloads from using all the connections in the pool, but it isn’t used any more and can be removed.
---
 .../sakaiproject/db/impl/BasicSqlService.java   | 17 -----------------
 .../src/main/webapp/WEB-INF/db-components.xml   | 11 +----------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java
index 494359bd446d..a1c8125ec07d 100644
--- a/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java
+++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java
@@ -75,9 +75,6 @@ public abstract class BasicSqlService implements SqlService
 	/** The "shared", "common" database connection pool */
 	protected DataSource defaultDataSource;
 
-	/** The "slow" connection pool for file uploads/downloads */
-	protected DataSource longDataSource;
-
 	/** Should we do a commit after a single statement read? */
 	protected boolean m_commitAfterRead = false;
 
@@ -2453,20 +2450,6 @@ public void setDefaultDataSource(DataSource defaultDataSource)
 		this.defaultDataSource = defaultDataSource;
 	}
 
-	/**
-	 * @param slowDataSource
-	 *        The slowDataSource to set.
-	 */
-	public void setLongDataSource(DataSource slowDataSource)
-	{
-		if (log.isDebugEnabled())
-		{
-			log.debug("setLongDataSource(DataSource " + slowDataSource + ")");
-		}
-
-		this.longDataSource = slowDataSource;
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
diff --git a/kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml
index a52777867520..c16d2893c147 100644
--- a/kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml
+++ b/kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml
@@ -19,11 +19,7 @@
 		<property name="defaultDataSource">
 			<ref bean="javax.sql.DataSource" />
 		</property>
-		
-		<property name="longDataSource">
-			<ref bean="javax.sql.LongDataSource" />
-		</property>
-		
+
 		<property name="autoDdl">
 			<value>${auto.ddl}</value>
 		</property>
@@ -422,11 +418,6 @@
        <property name="targetDataSource"><ref bean="javax.sql.DataSource" /></property>
     </bean>
 
-    <!-- The "slow" connection pool for streaming downloads from db -->
-    <bean id="javax.sql.LongDataSource"
-            parent="javax.sql.BaseDataSource">
-    </bean>
-
 	<!--  The "Global" Hibernate Session Factory -->
 	<bean id="org.sakaiproject.springframework.orm.hibernate.GlobalSessionFactory"
 		  class="org.sakaiproject.springframework.orm.hibernate.AddableSessionFactoryBean"