close server when reference URL is not defined

ContextBroker · Jan 25, 2016 · 1b10c9e · 1b10c9e
1 parent b85ca7d
commit 1b10c9e
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/lib/SubscribeContext.js b/lib/SubscribeContext.js
@@ -162,7 +162,7 @@ function SubscribeContext(options)
     var port     = options.port     || 0
     var hostname = options.hostname || '0.0.0.0'
 
-    createServer(function(req, res)
+    var server = createServer(function(req, res)
     {
       req.pipe(concat(function(body)
       {
@@ -184,11 +184,15 @@ function SubscribeContext(options)
    */
   function onCloseRequest(result)
   {
-    eventSource.close()
-
     Object.defineProperty(self, 'subscriptionId', {value: null})
 
-    self.emit('close')
+    if(server)
+      server.close(self.emit.bind(self, 'close'))
+    else
+    {
+      eventSource.close()
+      self.emit('close')
+    }
 
     return result
   }
@@ -215,11 +219,11 @@ function SubscribeContext(options)
    */
   this.update = function(data)
   {
-    data.subscriptionId = this.subscriptionId
-
     return this
     .then(function()
     {
+      data.subscriptionId = this.subscriptionId
+
       requestOptions.uri.path = '/NGSI10/updateContextSubscription'
       requestOptions.body = data
 
@@ -233,10 +237,10 @@ function SubscribeContext(options)
    */
   this.close = function()
   {
-    var data = {subscriptionId: this.subscriptionId}
-
     return this.then(function()
     {
+      var data = {subscriptionId: this.subscriptionId}
+
       requestOptions.uri.path = '/NGSI10/unsubscribeContext'
       requestOptions.body = data