Bugfix, reset mutable state empty UUID (#784)

* add .vscode to .gitignore * bugfix: empty uuid in reset mutable state
cadence-workflow · May 26, 2018 · 7e5afe5 · 7e5afe5
1 parent 80ef7cb
commit 7e5afe5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.cov
 *.html
 .tmp/
+.vscode
 /vendor
 /cadence
 .DS_Store

diff --git a/common/persistence/cassandraPersistence.go b/common/persistence/cassandraPersistence.go
@@ -1635,13 +1635,21 @@ func (d *cassandraPersistence) ResetMutableState(request *ResetMutableStateReque
 		lastReplicationInfo[k] = createReplicationInfoMap(v)
 	}
 
+	parentDomainID := emptyDomainID
+	if executionInfo.ParentDomainID != "" {
+		parentDomainID = executionInfo.ParentDomainID
+	}
+	parentRunID := emptyRunID
+	if executionInfo.ParentRunID != "" {
+		parentRunID = executionInfo.ParentRunID
+	}
 	batch.Query(templateUpdateWorkflowExecutionWithReplicationQuery,
 		executionInfo.DomainID,
 		executionInfo.WorkflowID,
 		executionInfo.RunID,
-		executionInfo.ParentDomainID,
+		parentDomainID,
 		executionInfo.ParentWorkflowID,
-		executionInfo.ParentRunID,
+		parentRunID,
 		executionInfo.InitiatedID,
 		executionInfo.CompletionEvent,
 		executionInfo.TaskList,
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     *.cov
     *.html
     .tmp/
+    .vscode
     /vendor
     /cadence
     .DS_Store
@@ Expand Down @@