From 9e9f88b6b75e595165971e8c539fbc11f74e7a52 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Tue, 14 Apr 2020 11:22:06 -0400
Subject: [PATCH] ARTEMIS-2685 Fixing Examples

The examples were broken after the change on ServerUtil.
---
 .../org/apache/activemq/artemis/util/ServerUtil.java   | 10 +++++++++-
 .../artemis/tests/smoke/common/SmokeTestBase.java      |  2 +-
 .../artemis/tests/smoke/mqtt/MQTTLeakTest.java         |  2 +-
 .../replicationflow/ReplicationFlowControlTest.java    |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
index 4812d68b02..087a1b11d3 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/util/ServerUtil.java
@@ -105,11 +105,19 @@ public class ServerUtil {
    }
 
    public static void killServer(final Process server) throws Exception {
+      killServer(server, false);
+   }
+
+   public static void killServer(final Process server, boolean forcibly) throws Exception {
       if (server != null) {
          System.out.println("**********************************");
          System.out.println("Killing server " + server);
          System.out.println("**********************************");
-         server.destroyForcibly();
+         if (forcibly) {
+            server.destroyForcibly();
+         } else {
+            server.destroy();
+         }
          server.waitFor();
          Thread.sleep(1000);
       }
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
index f91a361693..e6c2a6e6a4 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/common/SmokeTestBase.java
@@ -33,7 +33,7 @@ public class SmokeTestBase extends ActiveMQTestBase {
    public void after() throws Exception {
       for (Process process : processes) {
          try {
-            ServerUtil.killServer(process);
+            ServerUtil.killServer(process, true);
          } catch (Throwable e) {
             e.printStackTrace();
          }
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
index 4ac374a159..5d017db4bf 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
@@ -60,7 +60,7 @@ public class MQTTLeakTest extends SmokeTestBase {
          MQTTRunner.run();
       } finally {
 
-         ServerUtil.killServer(server0);
+         ServerUtil.killServer(server0, true);
       }
    }
 
diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/replicationflow/ReplicationFlowControlTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/replicationflow/ReplicationFlowControlTest.java
index 0dd579d028..7dd6507151 100644
--- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/replicationflow/ReplicationFlowControlTest.java
+++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/replicationflow/ReplicationFlowControlTest.java
@@ -122,7 +122,7 @@ public class ReplicationFlowControlTest extends SmokeTestBase {
             if (KILL_SERVER >= 0 && i == KILL_SERVER) {
                session.commit();
                System.out.println("Killing server");
-               ServerUtil.killServer(server0);
+               ServerUtil.killServer(server0, true);
                Thread.sleep(2000);
                connection.close();
                connection = connectionFactory.createConnection();