remove extraneous check on dontkill

FigureTechnologies · Dec 26, 2019 · 459ea3b · 459ea3b
1 parent da41b77
commit 459ea3b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/core/container/kubernetescontroller/kubernetescontroller.go b/core/container/kubernetescontroller/kubernetescontroller.go
@@ -185,11 +185,7 @@ func (api *KubernetesAPI) Start(ccid ccintf.CCID,
 func (api *KubernetesAPI) Stop(ccid ccintf.CCID, timeout uint, dontkill bool, dontremove bool) error {
 	kubernetesLogger.Infof("Stop chaincode %s requested. [kill=%t, remove=%t]", ccid.Name, !dontkill, !dontremove)
 	// Remove any existing deployments by matching labels
-	if !dontremove && !dontremove {
-		return api.stopAllInternal(ccid)
-	}
-
-	return nil
+	return api.stopAllInternal(ccid)
 }
 
 // Wait blocks until the container stops and returns the exit code of the container.