Author: shawkins
Date: 2011-04-18 17:28:18 -0400 (Mon, 18 Apr 2011)
New Revision: 3100
Modified:
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java
Log:
TEIID-1558 fix for npe using an id based query
Modified:
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java
===================================================================
---
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2011-04-18
14:55:32 UTC (rev 3099)
+++
trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2011-04-18
21:28:18 UTC (rev 3100)
@@ -336,8 +336,12 @@
try {
List<SObject> objects = sfSoap.retrieve(fieldList, sObjectType, ids, sh);
QueryResult result = new QueryResult();
- result.getRecords().addAll(objects);
- result.setSize(objects.size());
+ for (SObject sObject : objects) {
+ if (sObject != null) {
+ result.getRecords().add(sObject);
+ }
+ }
+ result.setSize(result.getRecords().size());
result.setDone(true);
return result;
} catch (InvalidFieldFault e) {
Show replies by date