FileGetter.java-Merge this if statement with the enclosing one

[aaf/authz.git] / auth / auth-cass / src / main / java / org / onap / aaf / auth / dao / cached / FileGetter.java

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/FileGetter.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/FileGetter.java
index b7a6c59..a8c86fa 100644 (file)
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/FileGetter.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/FileGetter.java
@@ -51,8 +51,7 @@ public class FileGetter {
        private FileGetter(Access access) {
                if(access!=null) {
                        String filename = access.getProperty(AAF_FILEGETTER,null);
-                       if(filename!=null) {
-                               if(!isLoaded) {
+                       if((filename!=null)&&(!isLoaded)) { 
                                        data = new TreeMap<>();
                                        sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss+SSSS");
                                        CSV csv = new CSV(access, filename).setDelimiter('|');
@@ -103,7 +102,7 @@ public class FileGetter {
                                        } catch( CadiException | IOException e) {
                                                access.log(Level.ERROR, e);
                                        }
-                               }
+                               
                        }
                }
        }