X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FWidgetsController.java;fp=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FWidgetsController.java;h=b718d56a91ccb4fc9bec60622c5f57ba9b907885;hb=32c146dacb247d512690f5e95ace5b71ce6dc02e;hp=45035a2561a6a222ad6fcaf6e3c241d396f36cb9;hpb=99a220e3fccdabca5c5d1f63582a77a0379ac057;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsController.java
index 45035a25..b718d56a 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsController.java
@@ -121,17 +121,18 @@ public class WidgetsController extends EPRestrictedBaseController {
 			@RequestBody OnboardingWidget onboardingWidget, HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
 		FieldsValidator fieldsValidator = null;
-		if (onboardingWidget!=null){
-			if(!dataValidator.isValid(onboardingWidget)){
+		if (onboardingWidget!=null && !dataValidator.isValid(onboardingWidget)){
 				fieldsValidator = new FieldsValidator();
 				fieldsValidator.setHttpStatusCode((long)HttpServletResponse.SC_NOT_ACCEPTABLE);
 				return fieldsValidator;
-			}
 		}
 
 		if (userHasPermissions(user, response, "putOnboardingWidget")) {
-			onboardingWidget.id = widgetId; // !
-			onboardingWidget.normalize();
+            if (onboardingWidget != null) {
+                onboardingWidget.id = widgetId; // !
+                onboardingWidget.normalize();
+            }
+
 			fieldsValidator = widgetService.setOnboardingWidget(user, onboardingWidget);
 			response.setStatus(fieldsValidator.httpStatusCode.intValue());
 		}
@@ -146,17 +147,18 @@ public class WidgetsController extends EPRestrictedBaseController {
 		EPUser user = EPUserUtils.getUserSession(request);
 		FieldsValidator fieldsValidator = null;
 
-		if (onboardingWidget!=null){
-			if(!dataValidator.isValid(onboardingWidget)){
+		if (onboardingWidget!=null && !dataValidator.isValid(onboardingWidget)){
 				fieldsValidator = new FieldsValidator();
 				fieldsValidator.setHttpStatusCode((long)HttpServletResponse.SC_NOT_ACCEPTABLE);
 				return fieldsValidator;
-			}
 		}
 
 		if (userHasPermissions(user, response, "postOnboardingWidget")) {
-			onboardingWidget.id = null; // !
-			onboardingWidget.normalize();
+		    
+            if (onboardingWidget != null) {
+                onboardingWidget.id = null; // !
+                onboardingWidget.normalize();
+            }
 			fieldsValidator = widgetService.setOnboardingWidget(user, onboardingWidget);
 			response.setStatus(fieldsValidator.httpStatusCode.intValue());
 		}