From f3efb107e285c9874e1d37f1cdcda8ceb1f7719b Mon Sep 17 00:00:00 2001
From: xuegao <xue.gao@intl.att.com>
Date: Mon, 1 Feb 2021 10:59:50 +0100
Subject: [PATCH] Fix potential NPE

Fix the potentail NPE in FeProxyServlet.

Issue-ID: SDC-3451
Signed-off-by: xuegao <xue.gao@intl.att.com>
Change-Id: I156e33c92882a264b98ea9e476382ae90a3befd4
---
 .../src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
index 337a8ae100..200684a530 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
@@ -103,7 +103,8 @@ public class FeProxyServlet extends SSLProxyServlet {
 	{
 		Configuration config = getConfiguration(clientRequest);
 		if (config == null) {
-			log.error("failed to retrieve configuration.");
+			log.error("Failed to retrieve configuration. Adding proxy header failed.");
+			return;
 		}
 		BasicAuthConfig basicAuth = config.getBasicAuth();
 		if (basicAuth.getEnabled()) {
-- 
2.16.6