Merge pull request #36 from IBMStreams/develop

2.1.1
IBMStreams · Dec 4, 2018 · 9b44baa · 9b44baa
2 parents 99bc98b + 933f510
commit 9b44baa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...treamsx.elasticsearch/impl/java/src/com/ibm/streamsx/elasticsearch/client/JESTClient.java b/...treamsx.elasticsearch/impl/java/src/com/ibm/streamsx/elasticsearch/client/JESTClient.java
@@ -337,15 +337,15 @@ public void bulkIndexSend() {
 				if (result.getErrorMessage() != null) {
 					logger.error("Bulk send failed. bulk size = " + Integer.toString(bulkSize));
 					logger.error("Error: " + result.getErrorMessage());
-				} else {
-					// TODO : how to test this code path ? 
-					for (BulkResultItem item : result.getItems()) {
-						if (item.error != null) {
-							failedInserts++;
-							logger.error("Bulk item indexing failed. " + item.error);
+				    if (null != result.getItems()) {
+						for (BulkResultItem item : result.getItems()) {
+							if (item.error != null) {
+								failedInserts++;
+								logger.error("Bulk item indexing failed. " + item.error);
+							}
 						}
-					}
-					logger.error("Bulk request was partially successful. Total items = " + Integer.toString(bulkSize) + ", failed = " + Integer.toString(failedInserts));
+						logger.error("Total items = " + Integer.toString(bulkSize) + ", failed = " + Integer.toString(failedInserts));
+				    }
 				}
 			}
 		}

diff --git a/com.ibm.streamsx.elasticsearch/info.xml b/com.ibm.streamsx.elasticsearch/info.xml
@@ -23,6 +23,10 @@ The Elasticsearch toolkit is an open source IBM Streams toolkit that provides ad
 
 This is an overview of changes for major and minor version upgrades. For details see the Releases in public Github.
 
+++ What is new in version 2.1.1
+
+* Fix missing error text information in case of bulk request failures.
+
 ++ What is new in version 2.1.0
 
 * The ElasticsearchIndex operator provides a new parameter 'documentAttribute'. Use this to pass complete JSON documents to the operator for indexing.
@@ -70,7 +74,7 @@ as they constitute serious security holes.
   you can use this parameter to temporarily disable hostnam verification.
 
 ]]></info:description>
-    <info:version>2.1.0</info:version>
+    <info:version>2.1.1</info:version>
     <info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies/>