summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2018-06-03 03:32:06 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-03 03:32:06 +0000
commit8fb50ae90757b085df212f36812bfa46fca9fb6e (patch)
tree5226b6e23932b42d15f9434d66feb88897148a30
parent85d039901ac2a32318581051621eb47e2bca0d3b (diff)
parent530f5bb48433fb8426cbf790f00f4fde3286a91e (diff)
Merge "Set controllerType to DEFAULT when null."
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
index 414f3e21ca..5182a75a79 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
@@ -86,6 +86,9 @@ public class ApplicationControllerClient {
* @param controllerType the controller type: "appc" or "sdnc".
*/
public ApplicationControllerClient(String controllerType) {
+ if (controllerType == null) {
+ controllerType = DEFAULT_CONTROLLER_TYPE;
+ }
this.controllerType = controllerType;
appCSupport = new ApplicationControllerSupport();
}
@@ -109,6 +112,9 @@ public class ApplicationControllerClient {
protected LifeCycleManagerStateful createAppCClient(String controllerType) {
try {
+ if (controllerType == null) {
+ controllerType = DEFAULT_CONTROLLER_TYPE;
+ }
return AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class)
.createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType));
} catch (AppcClientException e) {