From: Ram Koya <rk541m@att.com>
Date: Tue, 4 Sep 2018 13:11:57 +0000 (+0000)
Subject: Merge "AaflurAndFish.java - fixed sonar issue"
X-Git-Tag: 1.0.16~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b809e5df951fa8d1de40aebbce862da6436fc2fe;hp=fbcfeaab1d5ef0cecb0c4212b8ec9088d2408e38;p=dmaap%2Fdbcapi.git

Merge "AaflurAndFish.java - fixed sonar issue"
---

diff --git a/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
index b699a29..2366452 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/AafLurAndFish.java
@@ -31,8 +31,6 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.dmaap.dbcapi.aaf.AafLurService;
 import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
-import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
-import org.onap.dmaap.dbcapi.server.Main;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 
@@ -45,7 +43,6 @@ public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 	
 	AafLurAndFish()  throws AuthenticationErrorException  {
 	
-		String[] args = new String[1];
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
 		api_namespace = p.getProperty( "ApiNamespace", "org.onap.dmaap-bc.api");
 
@@ -61,13 +58,15 @@ public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 			}
 		} catch ( IOException e ) {
 			logger.error( "Unable to load " + cadiprop );
+			logger.error("Error", e);
 			throw new AuthenticationErrorException( );
 		}
 		try {
 			PropAccess myAccess = new PropAccess( props );
 		
 			svc =  AafLurService.getInstance(myAccess);
-		} catch (APIException | CadiException | LocatorException e ) { 
+		} catch (APIException | CadiException | LocatorException e ) {
+			logger.error("Error", e);
 			logger.error( e.toString() );
 			throw new AuthenticationErrorException();
 		}
@@ -78,10 +77,12 @@ public class AafLurAndFish implements ApiAuthorizationCheckInterface {
 	
 		try {
 			boolean resp = svc.checkPerm( api_namespace, mechid, pwd, p );
-			if ( resp == false ) {
+			boolean flag = false;
+			if ( resp == flag ) {
 				throw new AuthenticationErrorException();
 			}
 		} catch ( IOException | CadiException  e ) { 
+			logger.error("Error", e);
 			logger.error( e.toString() );
 			throw new AuthenticationErrorException();
 		}