From 644e19e23f8fde1e758f54541f5cd549b1ed33fc Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Fri, 24 Aug 2018 11:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9Aclient=20newsession?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=A6=82=E6=9E=9Ctoken=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89service=20catalog=EF=BC=8C=E5=AF=BC=E8=87=B4fatal=20er?=
 =?UTF-8?q?ror?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/mcclient/mcclient.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/mcclient/mcclient.go b/pkg/mcclient/mcclient.go
index 45ee26bc1c..b537ae1a40 100644
--- a/pkg/mcclient/mcclient.go
+++ b/pkg/mcclient/mcclient.go
@@ -311,10 +311,12 @@ func (this *Client) SetProject(tenantId, tenantName string, token TokenCredentia
 
 func (this *Client) NewSession(region, zone, endpointType string, token TokenCredential, apiVersion string) *ClientSession {
 	cata := token.GetServiceCatalog()
-	if cata == nil {
-		log.Fatalf("Missing service catalog in token")
+	if this.serviceCatalog == nil {
+		if cata == nil {
+			log.Fatalf("Missing service catalog in token")
+		}
+		this.serviceCatalog = cata
 	}
-	this.serviceCatalog = cata
 	return &ClientSession{client: this, region: region, zone: zone,
 		endpointType: endpointType, token: token,
 		apiVersion: apiVersion,