X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=webapp%2Fsrc%2Fapp%2F%40core-xds%2Fservices%2Fxds-config.service.ts;h=182ff536cb4cf16d3557153a0c9699b9718b7fbb;hb=82ede02a56e12026b2dfb1baeacabfbd564006b1;hp=75596736d961088c79bf1b2910d37ccbe88f2151;hpb=38c0c21a969e621c725245ce91c78e77076c5ce7;p=src%2Fxds%2Fxds-agent.git

diff --git a/webapp/src/app/@core-xds/services/xds-config.service.ts b/webapp/src/app/@core-xds/services/xds-config.service.ts
index 7559673..182ff53 100644
--- a/webapp/src/app/@core-xds/services/xds-config.service.ts
+++ b/webapp/src/app/@core-xds/services/xds-config.service.ts
@@ -1,3 +1,21 @@
+/**
+* @license
+* Copyright (C) 2017 "IoT.bzh"
+* Author Sebastien Douheret <sebastien@iot.bzh>
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
@@ -47,7 +65,7 @@ export class XDSConfigService {
   }
 
   getCurServer(): IXDServerCfg {
-    return Object.assign({}, this._curServer);
+    return this._curServer;
   }
 
   setCurServer(svr: IXDServerCfg): Observable<IXDServerCfg> {
@@ -58,7 +76,7 @@ export class XDSConfigService {
         .map(cfg => this._updateCurServer())
         .catch(err => {
           this._curServer.connected = false;
-          this.curServer$.next(Object.assign({}, this._curServer));
+          this.curServer$.next(this._curServer);
           return Observable.throw(err);
         });
     } else {
@@ -66,7 +84,7 @@ export class XDSConfigService {
         return this.xdsAgentSvr.setServerRetry(curSvr.id, svr.connRetry)
           .map(cfg => this._updateCurServer())
           .catch(err => {
-            this.curServer$.next(Object.assign({}, this._curServer));
+            this.curServer$.next(this._curServer);
             return Observable.throw(err);
           });
       }
@@ -74,9 +92,10 @@ export class XDSConfigService {
     return Observable.of(curSvr);
   }
 
-  private _updateCurServer() {
+  private _updateCurServer(): IXDServerCfg {
     this._curServer = this._getCurServer();
-    this.curServer$.next(Object.assign({}, this._curServer));
+    this.curServer$.next(this._curServer);
+    return this._curServer;
   }
 
   private _getCurServer(url?: string): IXDServerCfg {