Merge remote-tracking branch 'upstream/master'

weisong44 · weisong44 · commit f28b491de20c · 2018-08-23T15:22:40.000-07:00
diff --git a/samza-core/src/main/java/org/apache/samza/task/TaskCallbackImpl.java b/samza-core/src/main/java/org/apache/samza/task/TaskCallbackImpl.java
@@ -71,7 +71,7 @@ public void complete() {
     if (isComplete.compareAndSet(false, true)) {
       listener.onComplete(this);
     } else {
-      String msg = String.format("Callback complete was invoked after completion for task {}, ssp {}, offset {}.",
+      String msg = String.format("Callback complete was invoked after completion for task %s, ssp %s, offset %s.",
           taskName, envelope.getSystemStreamPartition(), envelope.getOffset());
       listener.onFailure(this, new IllegalStateException(msg));
     }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void complete() {`
`71`	`71`	`if (isComplete.compareAndSet(false, true)) {`
`72`	`72`	`listener.onComplete(this);`
`73`	`73`	`} else {`
`74`		`- String msg = String.format("Callback complete was invoked after completion for task {}, ssp {}, offset {}.",`
	`74`	`+ String msg = String.format("Callback complete was invoked after completion for task %s, ssp %s, offset %s.",`
`75`	`75`	`taskName, envelope.getSystemStreamPartition(), envelope.getOffset());`
`76`	`76`	`listener.onFailure(this, new IllegalStateException(msg));`
`77`	`77`	`}`