From 53fd66f6d6a012005d5748dcd0cfb929e68bef7e Mon Sep 17 00:00:00 2001
From: Kai Yang <kfstorm@outlook.com>
Date: Sat, 24 Aug 2019 11:10:02 +0800
Subject: [PATCH] [Java] Destroy native core worker before killing ray
 processes (#5516)

---
 .../src/main/java/org/ray/runtime/RayNativeRuntime.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/runtime/src/main/java/org/ray/runtime/RayNativeRuntime.java b/java/runtime/src/main/java/org/ray/runtime/RayNativeRuntime.java
index ab1b6d0b7..c15a87033 100644
--- a/java/runtime/src/main/java/org/ray/runtime/RayNativeRuntime.java
+++ b/java/runtime/src/main/java/org/ray/runtime/RayNativeRuntime.java
@@ -131,13 +131,13 @@ public final class RayNativeRuntime extends AbstractRayRuntime {
 
   @Override
   public void shutdown() {
-    if (null != manager) {
-      manager.cleanup();
-    }
     if (nativeCoreWorkerPointer != 0) {
       nativeDestroyCoreWorker(nativeCoreWorkerPointer);
       nativeCoreWorkerPointer = 0;
     }
+    if (null != manager) {
+      manager.cleanup();
+    }
   }
 
   public void run() {