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 414f3e2..5182a75 100644 (file)
--- 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) {