SUP-8601

kaltura · Jun 28, 2016 · 7f12297 · 7f12297
1 parent 2bd6aaa
commit 7f12297
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/lib/entry/FlavorDownloader.js b/lib/entry/FlavorDownloader.js
@@ -228,33 +228,33 @@ var FlavorDownloader = (function() {
                         .then(function(m3u) {
                             return updateListOfNewChunksToProcess(m3u);
                         })
-                        .then(function(newChunks) {
+                        .then(function (newChunks) {
 
                             var deferred = Q.defer();
 
                             downloadChunks.call(that, baseUrl, _.keys(that.chunksToDownload))
-                                .finally(function() {
-                                     that.m3u8generator.update(newChunks)
-                                    .then(function(results) {
-                                        var newItemsCount= results.newItemsCount;
-                                        if (newItemsCount > 0) {
-                                            that.emit('newTsFiles', that, newItemsCount);
-                                        }
-                                        return results;
-                                    })
-                                    .then(function(results) {
-                                        processObsoleteChunks(results); // Trigger deletion on a best-effort basis
-                                        return results;
-                                    })
-                                    .then(function(result){
-                                        deferred.resolve(result);
-                                    })
-                                    .catch(function(err){
-                                    deferred.reject(err);
-                                })
+                                .finally(function () {
+                                    that.m3u8generator.update(newChunks)
+                                        .then(function (results) {
+                                            var newItemsCount = results.newItemsCount;
+                                            if (newItemsCount > 0) {
+                                                that.emit('newTsFiles', that, newItemsCount);
+                                            }
+                                            return results;
+                                        })
+                                        .then(function (results) {
+                                            processObsoleteChunks(results); // Trigger deletion on a best-effort basis
+                                            return results;
+                                        })
+                                        .then(function (result) {
+                                            deferred.resolve(result);
+                                        })
+                                        .catch(function (err) {
+                                            deferred.reject(err);
+                                        })
+                                });
+                            return deferred.promise;
                         });
-                        return deferred.promise;
-                    });
                 }, function(err) {
                     if (err == httpUtils.HttpDownloadNotChanged) {
                         return Q.resolve();

diff --git a/lib/manifest/PlaylistGenerator.js b/lib/manifest/PlaylistGenerator.js
@@ -19,7 +19,7 @@ function PlaylistGenerator(entryObject, isNewSession) {
     this.streamInfo = entryObject.getStreamInfo();
     this.flavorsObjArray = null;
     this.logger = loggerModule.getLogger("PlaylistGenerator", "[" + this.entryId + "] ");
-    this.entryServerNodeId = entryObject.entryServerNodeId ? entryObject.entryServerNodeId : null;
+    this.entryServerNodeId = null;
     this.entryServerType = parseInt(entryObject.serverType);
 }
 
@@ -92,7 +92,7 @@ function savePlaylist() {
                 that.entryServerNodeId ? Q.Promise.resolve(that.entryServerNodeId)
                     : backendClient.getLiveEntryServerNodes(that.entryId).then(function(liveEntryServerNodes) {
 
-                    that.entryServerNodeId = 0;
+                    that.entryServerNodeId = null;
                     _.each(liveEntryServerNodes, function(liveEntryServerNode) {
                         if (liveEntryServerNode.serverType === that.entryServerType) {
                             that.entryServerNodeId = liveEntryServerNode.id;
@@ -101,7 +101,7 @@ function savePlaylist() {
                     });
 
                 }).catch(function() {
-                    that.entryServerNodeId = 0;
+                    that.entryServerNodeId = null;
                    return null;
                 });