Skip to content

Commit

Permalink
Merge pull request #149 from forcedotcom/xbian/fixMappingIssue2
Browse files Browse the repository at this point in the history
Fixing Mapping issue part 2
  • Loading branch information
jjangsfdc authored Jan 5, 2018
2 parents f0728fe + c3cbfaa commit a47d6de
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/main/java/com/salesforce/dataloader/mapping/LoadMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,19 @@

package com.salesforce.dataloader.mapping;

import java.util.*;
import java.util.Map.Entry;

import com.salesforce.dataloader.client.PartnerClient;
import com.salesforce.dataloader.exception.MappingInitializationException;
import com.salesforce.dataloader.model.Row;
import com.sforce.soap.partner.Field;

import org.apache.log4j.Logger;
import org.springframework.util.StringUtils;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;

/**
* Mapper which maps field names for loading operations. Field names are mapped from dao (local) name to sfdc name.
*
Expand Down Expand Up @@ -73,7 +76,7 @@ public Map<String, String> getMappingWithUnmappedColumns(boolean includeUnmapped
public Row mapData(Row localRow) {
Row mappedData = new Row();
for (Map.Entry<String, Object> entry : localRow.entrySet()) {
String sfdcName = getMapping(entry.getKey());
String sfdcName = getMapping(entry.getKey(), true);
if (StringUtils.hasText(sfdcName)) {
mappedData.put(sfdcName, entry.getValue());
} else {
Expand Down

0 comments on commit a47d6de

Please sign in to comment.