Merge branch 'devel' into dbeaver-infra#2-renew-certificates

dbeaver · May 14, 2024 · b644a70 · b644a70
2 parents b8dc69e + bbd296f
commit b644a70
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java b/...e.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebServiceDataTransfer.java
@@ -338,22 +338,17 @@ private void importData(
             DBRProgressMonitor monitor,
             DataTransferProcessorDescriptor processor,
             @NotNull DBSDataManipulator dataContainer,
-            Path path) throws DBException
-    {
+            Path path) throws DBException {
         IDataTransferProcessor processorInstance = processor.getInstance();
 
+        StreamTransferProducer producer;
         if (dataContainer.getDataSource() != null) {
-            DatabaseTransferConsumer consumer = new DatabaseTransferConsumer(dataContainer);
+            producer = new StreamTransferProducer(new StreamEntityMapping(path), processor);
 
+            DatabaseTransferConsumer consumer = new DatabaseTransferConsumer(dataContainer);
             DatabaseConsumerSettings databaseConsumerSettings = new DatabaseConsumerSettings();
             databaseConsumerSettings.setContainer((DBSObjectContainer) dataContainer.getDataSource());
             consumer.setSettings(databaseConsumerSettings);
-            DatabaseMappingContainer databaseMappingContainer = new DatabaseMappingContainer(databaseConsumerSettings, dataContainer);
-            databaseMappingContainer.getAttributeMappings(monitor);
-            databaseMappingContainer.setTarget(dataContainer);
-            consumer.setContainerMapping(databaseMappingContainer);
-
-            StreamTransferProducer producer = new StreamTransferProducer(new StreamEntityMapping(path), processor);
 
             StreamProducerSettings producerSettings = new StreamProducerSettings();
             Map<String, Object> properties = new HashMap<>();
@@ -366,7 +361,11 @@ private void importData(
                     producer,
                     processorInstance,
                     properties);
-
+            DatabaseMappingContainer databaseMappingContainer =
+                new DatabaseMappingContainer(databaseConsumerSettings, producer.getDatabaseObject());
+            databaseMappingContainer.getAttributeMappings(monitor);
+            databaseMappingContainer.setTarget(dataContainer);
+            consumer.setContainerMapping(databaseMappingContainer);
             try {
                 producer.transferData(monitor, consumer, processorInstance, producerSettings, null);
             } catch (DBException e) {