From 0e5ee07c54bc8b3f4b84b0d4c2a4927b12cd0761 Mon Sep 17 00:00:00 2001
From: Enrico Olivelli <eolivelli@apache.org>
Date: Fri, 15 Nov 2019 22:47:52 +0100
Subject: [PATCH] Enable DM_EXIT spotbugs rule for the full code base

---
 excludeFindBugsFilter.xml                                      | 3 ---
 .../src/main/java/org/apache/zookeeper/util/ServiceUtils.java  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/excludeFindBugsFilter.xml b/excludeFindBugsFilter.xml
index c836911dbe9..a2965944837 100644
--- a/excludeFindBugsFilter.xml
+++ b/excludeFindBugsFilter.xml
@@ -7,8 +7,5 @@
     <!-- this problem is to be addressed in ZOOKEEPER-3227 -->
     <Bug pattern="DM_DEFAULT_ENCODING"/>
 
-    <!-- not really a problem -->
-    <Bug pattern="DM_EXIT"/>
-
 </FindBugsFilter>
 
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
index 652b36028e6..29767ab2ff7 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/util/ServiceUtils.java
@@ -17,6 +17,7 @@
  */
 package org.apache.zookeeper.util;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Objects;
 import java.util.function.Consumer;
 import org.apache.zookeeper.ZooKeeperMain;
@@ -37,6 +38,7 @@ private ServiceUtils() {
     /**
      * Default strategy for shutting down the JVM.
      */
+    @SuppressFBWarnings("DM_EXIT")
     public static final Consumer<Integer> SYSTEM_EXIT = (code) -> {
         LOG.error("Exiting JVM with code {}", code);
         System.exit(code);