Merge branch '1.1.8'

Conflicts: lib/service/packageDetailsProvider.js
Hacklone · Sep 25, 2016 · d1ef840 · d1ef840
2 parents b0dd155 + 2945540
commit d1ef840
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/application.js b/lib/application.js
@@ -66,9 +66,10 @@ module.exports = function Application() {
 
     function _shutDown() {
         logger.log('Shutting down private-bower');
-
-        _listeningServer.close();
-
+        if(_listeningServer){
+            _listeningServer.close();
+        }
+
         publicPackageStore.shutDown();
 
         if(_repoCacheHandler) {

diff --git a/lib/service/packageDetailsProvider.js b/lib/service/packageDetailsProvider.js
@@ -9,9 +9,8 @@ var SvnPackageDetailsProvider = require('./svnPackageDetailsProvider');
 var utils = require('../infrastructure/utils');
 
 module.exports = function PackageDetailsProvider() {
-
     function _getPackageDetails(packageUrl) {
-        if(packageUrl.substring(0, 4) === 'svn+') {
+        if(packageUrl.startsWith('svn+')) {
             return SvnPackageDetailsProvider.getPackageDetails(packageUrl);
         }
         return GitPackageDetailsProvider.getPackageDetails(packageUrl);