From 0c1733dae925d2d020bb32b11419605945e6fdde Mon Sep 17 00:00:00 2001
From: Davide Grohmann <davide.grohmann@neotechnology.com>
Date: Tue, 11 Oct 2016 14:01:25 +0200
Subject: [PATCH] Fix typing in LifeSupport

---
 .../src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java | 4 ++--
 .../test/java/org/neo4j/kernel/impl/ha/ClusterManager.java    | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
index c967225d39204..d041dc38638f8 100644
--- a/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
+++ b/community/common/src/main/java/org/neo4j/kernel/lifecycle/LifeSupport.java
@@ -261,7 +261,7 @@ private boolean notAlreadyAdded( Lifecycle instance )
         return true;
     }
 
-    public synchronized boolean remove( Object instance )
+    public synchronized boolean remove( Lifecycle instance )
     {
         for ( int i = 0; i < instances.size(); i++ )
         {
@@ -508,7 +508,7 @@ public String toString()
             return instance.toString() + ": " + currentStatus.name();
         }
 
-        public boolean isInstance( Object instance )
+        public boolean isInstance( Lifecycle instance )
         {
             return this.instance == instance;
         }
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java b/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java
index 2b779f9dbffdb..91576c6f19f75 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/impl/ha/ClusterManager.java
@@ -171,7 +171,7 @@ public static IntFunction<String> constant( final String value )
     private ManagedCluster managedCluster;
     private final boolean consistencyCheck;
     private final int firstInstanceId;
-    LifeSupport life;
+    private LifeSupport life;
 
     private ClusterManager( Builder builder )
     {
@@ -1217,7 +1217,6 @@ public RepairKit shutdown( HighlyAvailableGraphDatabase db )
             InstanceId serverId =
                     db.getDependencyResolver().resolveDependency( Config.class ).get( ClusterSettings.server_id );
             members.remove( serverId );
-            life.remove( db );
             db.shutdown();
             await( entireClusterSeesMemberAsNotAvailable( db ) );
             return wrap( new StartDatabaseAgainKit( this, serverId ) );