Merge pull request #986 from ashitsalesforce/master

Fix for W-14887469 and W-14893310

Author: ashitsalesforce

pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.force</groupId>
   <artifactId>dataloader</artifactId>
   <packaging>jar</packaging>
-  <version>60.0.0</version>
+  <version>60.0.1</version>
   <name>Salesforce Data Loader</name>
   <url>https://github.com/forcedotcom/dataloader</url>
   <organization>

src/main/java/com/salesforce/dataloader/action/visitor/BulkLoadVisitor.java

@@ -64,7 +64,6 @@
 import com.salesforce.dataloader.exception.DataAccessObjectInitializationException;
 import com.salesforce.dataloader.exception.LoadException;
 import com.salesforce.dataloader.exception.OperationException;
-import com.salesforce.dataloader.exception.ParameterLoadException;
 import com.salesforce.dataloader.model.NACalendarValue;
 import com.salesforce.dataloader.model.NADateOnlyCalendarValue;
 import com.salesforce.dataloader.model.NATextValue;
@@ -542,17 +541,9 @@ private void processBatchResults(final BatchInfo batch, final String errorMessag
         final int idIdx = hdrIndices.get(ID_RESULT_COL);
         final int errIdx = hdrIndices.get(ERROR_RESULT_COL);
         hdrIndices = null;
-        int dataReaderRowCount = 0;
-        int skippedRowsCount = 0;
-        try {
-            skippedRowsCount = controller.getConfig().getInt(Config.LOAD_ROW_TO_START_AT);
-        } catch (ParameterLoadException e) {
-            // @ignored
-        }
 
         for (final Row row : rows) {
-            boolean conversionSuccessOfRow = isRowConversionSuccessful(skippedRowsCount 
-                        + this.firstDAORowForCurrentBatch + dataReaderRowCount++);
+            boolean conversionSuccessOfRow = isRowConversionSuccessful();
             if (!conversionSuccessOfRow) {
                 continue; // this DAO row failed to convert and was not part of the batch sent to the server. Go to the next one
             }

src/main/java/com/salesforce/dataloader/action/visitor/DAOLoadVisitor.java

@@ -110,8 +110,20 @@ public void setRowConversionStatus(int dataSourceRow, boolean conversionSuccess)
         }
     }
 
-    protected boolean isRowConversionSuccessful(int dataSourceRow) {
-        Boolean conversionFailure = this.rowConversionFailureMap.get(dataSourceRow);
+    private int rowConversionCheckCounter = 0;
+    private boolean gotSkippedRowsCount = false;
+    private int skippedRowsCount = 0;
+    protected boolean isRowConversionSuccessful() {
+        if (!gotSkippedRowsCount) {
+            try {
+                skippedRowsCount = controller.getConfig().getInt(Config.LOAD_ROW_TO_START_AT);
+                gotSkippedRowsCount = true;
+            } catch (ParameterLoadException e) {
+                // @ignored
+            }
+        }
+        int rowToCheck = skippedRowsCount + rowConversionCheckCounter++;
+        Boolean conversionFailure = this.rowConversionFailureMap.get(rowToCheck);
         if (conversionFailure != null && conversionFailure.booleanValue()) {
             return false;
         }

src/main/java/com/salesforce/dataloader/action/visitor/PartnerLoadVisitor.java

@@ -130,15 +130,9 @@ private void writeOutputToWriter(Object[] results)
         // have to do this because although saveResult and deleteResult
         // are a) not the same class yet b) not subclassed
         int batchRowCounter = 0;
-        int startAtDAORow = 0;
-        try {
-            startAtDAORow = controller.getConfig().getInt(Config.LOAD_ROW_TO_START_AT);
-        } catch (ParameterLoadException e) {
-            // @ignored
-        }
         for (int i = 0; i < this.daoRowList.size(); i++) {
             Row daoRow = this.daoRowList.get(i);
-            if (!isRowConversionSuccessful(startAtDAORow + i)) {
+            if (!isRowConversionSuccessful()) {
                 continue;
             }
             String statusMsg = null;