From: Elena Kuleshov <ek1439@att.com>
Date: Thu, 31 May 2018 18:33:26 +0000 (-0400)
Subject: Set controllerType to DEFAULT when null.
X-Git-Tag: v1.2.1~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=530f5bb48433fb8426cbf790f00f4fde3286a91e;p=so.git

Set controllerType to DEFAULT when null.

Change-Id: I6fa62b9dca0e7f69030fffab5cbc13fe57b39294
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>
---

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) {