Updating the check SSL condition

payal-hshah · Dec 17, 2013 · fb6901d · fb6901d
1 parent abd45c9
commit fb6901d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/descriptor-schema.json b/config/descriptor-schema.json
@@ -4,6 +4,7 @@
     "properties" : {
         "name" : { "type" : "string", "required" :true },
         "commonlib" : { "type" : "string"},
+        "useSSL" : { "type" : "boolean"},
         "extends" : { "type" : "string"},
         "startProxyServer" : { "type" : "boolean"},
         "routerProxyConfig" : { "type" : "string"},
@@ -15,7 +16,7 @@
                 "required":true,
                 "additionalProperties" : {
                     "type" : "object",
-                    "properties" : { 
+                    "properties" : {
                         "enabled" : { "type" : "boolean | string" },
                         "controller" : { "type" : "string" },
                         "group" : { "type" : "string" },
@@ -32,7 +33,7 @@
                                 "engine" :{ "type" : "string" },
                                 "engineConfig" :{ "type" : "string" }
                             }
-                            
+
                         }
                      },
                      "additionalProperties": false

diff --git a/lib/session/sessionfactory.js b/lib/session/sessionfactory.js
@@ -190,7 +190,7 @@ SessionFactory.prototype.getFactoryTests = function () {
         //Check if the useSSL flag is set from either commandline or at descriptor level
         if (testJson.useSSL) {
             testJson =  setSSL(testJson);
-        } else if (this.useSSL) {
+        } else if (this.useSSL && testJson.useSSL) {
             testJson =  setSSL(testJson);
         }