#1762 Data (CSV) exporter fix (error handling)

Former-commit-id: 63962ff4

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java

@@ -148,10 +148,10 @@ public class StreamTransferConsumer implements IDataTransferConsumer<StreamConsu
             }
             // Export row
             processor.exportRow(session, row);
-        } catch (DBException e) {
-            throw new DBCException("Error while exporting table row", e);
         } catch (IOException e) {
             throw new DBCException("IO error", e);
+        } catch (Throwable e) {
+            throw new DBCException("Error while exporting table row", e);
         }
     }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/transfer/stream/impl/DataExporterCSV.java

@@ -129,7 +129,7 @@ public class DataExporterCSV extends StreamExporterAbstract {
     @Override
     public void exportRow(DBCSession session, Object[] row) throws DBException, IOException
     {
-        for (int i = 0; i < row.length; i++) {
+        for (int i = 0; i < row.length && i < columns.size(); i++) {
             DBDAttributeBinding column = columns.get(i);
             if (DBUtils.isNullValue(row[i])) {
                 if (!CommonUtils.isEmpty(nullString)) {