From f46c555e9eb56828441a3273ef8df8622ff955ae Mon Sep 17 00:00:00 2001
From: Stephanie Wang <swang@cs.berkeley.edu>
Date: Thu, 11 Jul 2019 23:31:21 -0700
Subject: [PATCH] Only get actor ID if actor task (#5180)

---
 src/ray/raylet/node_manager.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ray/raylet/node_manager.cc b/src/ray/raylet/node_manager.cc
index 4a5d2c612..905ee3ec1 100644
--- a/src/ray/raylet/node_manager.cc
+++ b/src/ray/raylet/node_manager.cc
@@ -1912,10 +1912,10 @@ void NodeManager::FinishAssignedActorTask(Worker &worker, const Task &task) {
           // The task was in the GCS task table. Use the stored task spec to
           // get the parent actor id.
           Task parent_task(parent_task_data.task());
-          ActorID parent_actor_id;
+          ActorID parent_actor_id = ActorID::Nil();
           if (parent_task.GetTaskSpecification().IsActorCreationTask()) {
             parent_actor_id = parent_task.GetTaskSpecification().ActorCreationId();
-          } else {
+          } else if (parent_task.GetTaskSpecification().IsActorTask()) {
             parent_actor_id = parent_task.GetTaskSpecification().ActorId();
           }
           FinishAssignedActorCreationTask(parent_actor_id, task_spec,
@@ -1933,7 +1933,7 @@ void NodeManager::FinishAssignedActorTask(Worker &worker, const Task &task) {
             Task parent_task = lineage_cache_.GetTaskOrDie(parent_task_id);
             if (parent_task.GetTaskSpecification().IsActorCreationTask()) {
               parent_actor_id = parent_task.GetTaskSpecification().ActorCreationId();
-            } else {
+            } else if (parent_task.GetTaskSpecification().IsActorTask()) {
               parent_actor_id = parent_task.GetTaskSpecification().ActorId();
             }
           } else {