Fix NPE in DescribeMutableState (#3850)

cadence-workflow · Dec 14, 2020 · 92c7457 · 92c7457
1 parent 6e20336
commit 92c7457
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/service/history/historyEngine.go b/service/history/historyEngine.go
@@ -1393,10 +1393,12 @@ func (e *historyEngineImpl) DescribeMutableState(
 
 	response = &h.DescribeMutableStateResponse{}
 
-	if msb := cacheCtx.GetWorkflowExecution(); cacheHit && msb != nil {
-		response.MutableStateInCache, err = e.toMutableStateJSON(msb)
-		if err != nil {
-			return nil, err
+	if cacheHit {
+		if msb := cacheCtx.GetWorkflowExecution(); msb != nil {
+			response.MutableStateInCache, err = e.toMutableStateJSON(msb)
+			if err != nil {
+				return nil, err
+			}
 		}
 	}