From cddbf4178c451ed6ff7a0eb3aaf0655176107221 Mon Sep 17 00:00:00 2001
From: st782s <statta@research.att.com>
Date: Wed, 1 Aug 2018 17:16:07 -0400
Subject: Get Analytics call resulting in NPE

Issue-ID: PORTAL-344,PORTAL-288

Includes POM changes to prepare for release

Change-Id: Ia7980c27ae1859273bacac8b7569d9396d31fe0c
Signed-off-by: st782s <statta@research.att.com>
---
 ecomp-sdk/epsdk-app-common/README.md                                 | 3 +++
 ecomp-sdk/epsdk-app-common/pom.xml                                   | 2 +-
 .../java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java    | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'ecomp-sdk/epsdk-app-common')

diff --git a/ecomp-sdk/epsdk-app-common/README.md b/ecomp-sdk/epsdk-app-common/README.md
index 2ba60d3b..e9a5be68 100644
--- a/ecomp-sdk/epsdk-app-common/README.md
+++ b/ecomp-sdk/epsdk-app-common/README.md
@@ -24,6 +24,9 @@ AngularJS version 1.5.0.
 
 ### ONAP Distributions
 
+Version 2.4.0
+- PORTAL 344 Get Analytics call resulting in NPE
+
 Version 2.1.0
 - PORTAL 161 Add the JUNIT plumbing for PortalSDK
 - PORTAL 160 Prevent unauthorized access to SamplePages, Report Pages, Role
diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml
index 2d38b6a5..d534dfa1 100644
--- a/ecomp-sdk/epsdk-app-common/pom.xml
+++ b/ecomp-sdk/epsdk-app-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.portal.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
index 871a3750..f8c07a9b 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
@@ -120,9 +120,10 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR
 		// initialize the base class definition for Admin Auth Extension
 		adminAuthExtensionServiceImpl = appContext.getBean(IAdminAuthExtension.class);
 		userService = appContext.getBean(UserService.class);
-		if(isCentralized.equals(isAccessCentralized)){
-		restApiRequestBuilder = appContext.getBean(RestApiRequestBuilder.class);
 		appServiceImpl = appContext.getBean(AppService.class);
+		
+		if(isCentralized.equals(isAccessCentralized)){
+			restApiRequestBuilder = appContext.getBean(RestApiRequestBuilder.class);
 		}
 	}
 
-- 
cgit 1.2.3-korg