Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit caf3544

Browse files
committed
#199 Requiring true for mlSimpleSsl and mlAppServicesSimpleSsl
1 parent 9a7a451 commit caf3544

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public AppConfig newAppConfig() {
223223
c.setAppServicesExternalName(prop);
224224
}
225225

226-
if (getProperty("mlAppServicesSimpleSsl") != null) {
226+
if ("true".equals(getProperty("mlAppServicesSimpleSsl"))) {
227227
logger.info("Using simple SSL context and 'ANY' hostname verifier for authenticating against the App-Services server");
228228
c.setAppServicesSimpleSslConfig();
229229
}
@@ -331,7 +331,7 @@ public AppConfig newAppConfig() {
331331
* When modules are loaded via the Client REST API, if the app server requires an SSL connection, then
332332
* setting this property will force the simplest SSL connection to be created.
333333
*/
334-
if (getProperty("mlSimpleSsl") != null) {
334+
if ("true".equals(getProperty("mlSimpleSsl"))) {
335335
logger.info(
336336
"Using simple SSL context and 'ANY' hostname verifier for authenticating against client REST API server");
337337
c.setSimpleSslConfig();

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void allProperties() {
108108
p.setProperty("mlModulePermissions", "some-perm,read,some-perm,update");
109109
p.setProperty("mlAdditionalBinaryExtensions", ".gradle,.properties");
110110
p.setProperty("mlConfigPath", "src/test/resources/sample-app/empty-ml-config");
111-
p.setProperty("mlSimpleSsl", "anyvalue");
111+
p.setProperty("mlSimpleSsl", "true");
112112
p.setProperty("mlContentDatabaseName", "my-content-db");
113113
p.setProperty("mlModulesDatabaseName", "my-modules");
114114
p.setProperty("mlSchemasDatabaseName", "my-schemas-db");

0 commit comments

Comments
 (0)