From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Sun, 4 Dec 2016 09:50:20 +0000 (+0900)
Subject: [Convergence] Set discoveryStarted to false in error callback.
X-Git-Tag: accepted/tizen/3.0/common/20161207.194643~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2e5253d2777610781b3361dcfa8c7026b319815;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Convergence] Set discoveryStarted to false in error callback.

[Verification] Code compiles.

Change-Id: I05aa3c04f5dfe2232495c08c35c15921f37747a6
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---

diff --git a/src/convergence/convergence_api.js b/src/convergence/convergence_api.js
index 3d4650d..8abc3c2 100644
--- a/src/convergence/convergence_api.js
+++ b/src/convergence/convergence_api.js
@@ -135,9 +135,6 @@ ConvergenceManager.prototype.startDiscovery = function(successCallback,
   errorCallback, timeout) {
   console.log('Entered ConvergenceManager.startDiscovery()');
 
-  if (discoveryStarted)
-    throw new WebAPIException(WebAPIException.INVALID_STATE_ERR, 'Discovery has been started.');
-
   var args = validator_.validateArgs(arguments, [
     {name: 'successCallback', type: types_.LISTENER, values: ['onfound', 'onfinished' ]},
     {name: 'errorCallback', type: types_.FUNCTION, optional: true, nullable: true},
@@ -145,8 +142,9 @@ ConvergenceManager.prototype.startDiscovery = function(successCallback,
   ]);
 
   // Indicate, that discovery procedure is on
-  if (discoveryStarted === true)
+  if (discoveryStarted === true) {
     throw new WebAPIException(WebAPIException.INVALID_STATE_ERR, 'Discovery has already started.');
+  }
 
   discoveryStarted = true;
 
@@ -225,6 +223,7 @@ ConvergenceManager.prototype.startDiscovery = function(successCallback,
                }, function(result) {
                     if (native_.isFailure(result)) {
                       native_.callIfPossible(errorCallback, native_.getErrorObject(result));
+                      discoveryStarted = false;
                     }
                });