use a local connection object in DBSplitter

3dcitydb · Jul 27, 2022 · cda7562 · cda7562
1 parent be612a8
commit cda7562
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/...xp-core/src/main/java/org/citydb/core/operation/exporter/database/content/DBSplitter.java b/...xp-core/src/main/java/org/citydb/core/operation/exporter/database/content/DBSplitter.java
@@ -105,7 +105,6 @@ public class DBSplitter {
 
 	private final DatabaseConnectionPool connectionPool;
 	private final AbstractDatabaseAdapter databaseAdapter;
-	private final Connection connection;
 	private final String schema;
 	private final SchemaMapping schemaMapping;
 	private final SQLQueryBuilder builder;
@@ -137,8 +136,6 @@ public DBSplitter(FeatureWriter writer,
 
 		connectionPool = DatabaseConnectionPool.getInstance();
 		databaseAdapter = connectionPool.getActiveDatabaseAdapter();
-		connection = connectionPool.getConnection();
-		connection.setAutoCommit(false);
 		schema = databaseAdapter.getConnectionDetails().getSchema();
 
 		GeneralOptions generalOptions = config.getExportConfig().getGeneralOptions();
@@ -187,12 +184,16 @@ public void shutdown() {
 	}
 
 	public void startQuery() throws SQLException, QueryBuildException, FilterException, FeatureWriteException {
+		Connection connection = null;
 		try {
+			connection = connectionPool.getConnection();
+			connection.setAutoCommit(false);
+
 			FeatureType cityObjectGroupType = schemaMapping.getFeatureType("CityObjectGroup", CityObjectGroupModule.v2_0_0.getNamespaceURI());
 			Map<Long, DBSplittingResult> cityObjectGroups = new LinkedHashMap<>();
 			sequenceId = 0;
 
-			queryCityObject(cityObjectGroupType, cityObjectGroups);
+			queryCityObject(cityObjectGroupType, cityObjectGroups, connection);
 
 			if (shouldRun) {
 				try {
@@ -203,7 +204,7 @@ public void startQuery() throws SQLException, QueryBuildException, FilterExcepti
 			}
 
 			if (!cityObjectGroups.isEmpty()) {
-				queryCityObjectGroups(cityObjectGroupType, cityObjectGroups);
+				queryCityObjectGroups(cityObjectGroupType, cityObjectGroups, connection);
 
 				if (shouldRun) {
 					try {
@@ -224,7 +225,7 @@ public void startQuery() throws SQLException, QueryBuildException, FilterExcepti
 		}
 	}
 
-	private void queryCityObject(FeatureType cityObjectGroupType, Map<Long, DBSplittingResult> cityObjectGroups) throws SQLException, QueryBuildException, FeatureWriteException {
+	private void queryCityObject(FeatureType cityObjectGroupType, Map<Long, DBSplittingResult> cityObjectGroups, Connection connection) throws SQLException, QueryBuildException, FeatureWriteException {
 		if (!shouldRun)
 			return;
 
@@ -344,7 +345,7 @@ private void queryCityObject(FeatureType cityObjectGroupType, Map<Long, DBSplitt
 		}
 	}
 
-	private void queryCityObjectGroups(FeatureType cityObjectGroupType, Map<Long, DBSplittingResult> cityObjectGroups) throws SQLException, FilterException, QueryBuildException {
+	private void queryCityObjectGroups(FeatureType cityObjectGroupType, Map<Long, DBSplittingResult> cityObjectGroups, Connection connection) throws SQLException, FilterException, QueryBuildException {
 		if (!shouldRun)
 			return;