diff options
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/DAOException.java | 4 | ||||
| -rw-r--r-- | auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/cached/FileGetter.java | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/DAOException.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/DAOException.java index b6c35f20..7871e875 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/DAOException.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/DAOException.java @@ -3,6 +3,7 @@ * org.onap.aaf * =========================================================================== * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * =========================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,9 +30,6 @@ public class DAOException extends Exception { private static final long serialVersionUID = 1527904125585539823L; // // TODO - enum in result class == is our intended design, currently the DAO layer does not use Result<RV> so we still use these for now -// public final static DAOException RoleNotFoundDAOException = new DAOException("RoleNotFound"); -// public final static DAOException PermissionNotFoundDAOException = new DAOException("PermissionNotFound"); -// public final static DAOException UserNotFoundDAOException = new DAOException("UserNotFound"); public DAOException() { } 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 b7a6c59d..a8c86fa5 100644 --- 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); } - } + } } } |