From 5392478077fc83b1907518edf433873a8f0a46f6 Mon Sep 17 00:00:00 2001
From: Jeff <jeffzhang@yunify.com>
Date: Fri, 29 Mar 2019 14:59:29 +0800
Subject: [PATCH] fix vs bug

---
 .../virtualservice/virtualservice_controller.go          | 4 +++-
 vendor/github.com/kiali/kiali/models/destination_rule.go | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go
index eee6fbb2b..8fb75c435 100644
--- a/pkg/controller/virtualservice/virtualservice_controller.go
+++ b/pkg/controller/virtualservice/virtualservice_controller.go
@@ -287,8 +287,10 @@ func (v *VirtualServiceController) syncService(key string) error {
 					Labels:    util.ExtractApplicationLabels(&service.ObjectMeta),
 				},
 			}
+		} else {
+			log.Error(err, "cannot get virtualservice ", "namespace", namespace, "name", appName)
+			return err
 		}
-		return nil
 	}
 	vs := currentVirtualService.DeepCopy()
 
diff --git a/vendor/github.com/kiali/kiali/models/destination_rule.go b/vendor/github.com/kiali/kiali/models/destination_rule.go
index 8355fa69d..a4311e0ef 100644
--- a/vendor/github.com/kiali/kiali/models/destination_rule.go
+++ b/vendor/github.com/kiali/kiali/models/destination_rule.go
@@ -79,16 +79,17 @@ func (dRule *DestinationRule) HasCircuitBreaker(namespace string, serviceName st
 	return false
 }
 
+// change circuit breaker to true only connectionPool and outlierDetection
+// are both set
 func isCircuitBreakerTrafficPolicy(trafficPolicy interface{}) bool {
 	if trafficPolicy == nil {
 		return false
 	}
 	if dTrafficPolicy, ok := trafficPolicy.(map[string]interface{}); ok {
 		if _, ok := dTrafficPolicy["connectionPool"]; ok {
-			return true
-		}
-		if _, ok := dTrafficPolicy["outlierDetection"]; ok {
-			return true
+			if _, ok := dTrafficPolicy["outlierDetection"]; ok {
+				return true
+			}
 		}
 	}
 	return false