Replaced flawed null-ptr check by something better. :)

Author: lamai93

pkg/apis/deployment/v1alpha/image_info.go

@@ -74,10 +74,10 @@ func (l *ImageInfoList) AddOrUpdate(info ImageInfo) {
 
 // Equal compares to ImageInfo
 func (i *ImageInfo) Equal(other *ImageInfo) bool {
-	if i == other {
-		return true
-	} else if i == nil {
+	if i == nil || other == nil {
 		return false
+	} else if i == other {
+		return true
 	}
 
 	return i.ArangoDBVersion == other.ArangoDBVersion &&

pkg/apis/deployment/v1alpha/secret_hashes.go

@@ -38,10 +38,10 @@ type SecretHashes struct {
 
 // Equal compares two SecretHashes
 func (sh *SecretHashes) Equal(other *SecretHashes) bool {
-	if sh == other {
-		return true
-	} else if sh == nil {
+	if sh == nil || other == nil {
 		return false
+	} else if sh == other {
+		return true
 	}
 
 	return sh.AuthJWT == other.AuthJWT &&

pkg/util/times.go

@@ -35,10 +35,10 @@ func TimeCompareEqual(a, b metav1.Time) bool {
 
 // TimeCompareEqualPointer compares two times, allowing an error of 1s
 func TimeCompareEqualPointer(a, b *metav1.Time) bool {
-	if a == b {
-		return true
-	} else if a == nil {
+	if a == nil || b == nil {
 		return false
+	} else if a == b {
+		return true
 	}
 
 	return TimeCompareEqual(*a, *b)