Skip to content

Commit

Permalink
Fixed another bug on retrying failures
Browse files Browse the repository at this point in the history
  • Loading branch information
datasetutil committed Jan 27, 2015
1 parent baa24ad commit cac82ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<description>Analytics Cloud Datatset Utils</description>
<artifactId>datasetutils</artifactId>
<packaging>jar</packaging>
<version>32.0.13-SNAPSHOT</version>
<version>32.0.14-SNAPSHOT</version>
<url>https://github.com/forcedotcom/Analytics-Cloud-Dataset-Utils</url>
<organization>
<name>salesforce.com</name>
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/sforce/dataset/loader/DatasetLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,6 @@ public static boolean uploadEM(File dataFile, String dataFormat, byte[] metadata
Map<Integer, File> fileParts = chunkBinary(dataFile, datasetArchiveDir, logger);
boolean allPartsUploaded = false;
int retryCount=0;
int totalErrorCount = 0;
if(fileParts.size()<=MAX_NUM_UPLOAD_THREADS)
MAX_NUM_UPLOAD_THREADS = 1;
while(retryCount<3)
Expand Down Expand Up @@ -717,7 +716,6 @@ public static boolean uploadEM(File dataFile, String dataFormat, byte[] metadata
}
}
logger.println("FilePartsUploaderThread-"+(i+1)+" is done");
totalErrorCount = totalErrorCount + uploader.getErrorRowCount();
}

allPartsUploaded = true;
Expand All @@ -739,7 +737,7 @@ public static boolean uploadEM(File dataFile, String dataFormat, byte[] metadata
retryCount++;
}

if(totalErrorCount==0 && allPartsUploaded)
if(allPartsUploaded)
{
return updateFileHdr(partnerConnection, hdrId, null, null, null, null, "Process", null, logger);
}else
Expand Down

0 comments on commit cac82ba

Please sign in to comment.