Merge "CredDAO.java -Extract the assignment out of expression"

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Extend.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Extend.java
index 9e080b6..0077e9f 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Extend.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Extend.java
@@ -138,7 +138,8 @@ public class Extend extends Batch {
                         int i = hi.get();
                         StringBuilder sb = hsb.get();
                         if(sb==null) {
-                            hsb.set(sb=cqlBatch.begin());
+                            sb=cqlBatch.begin();
+                            hsb.set(sb);
                         }
                         switch(row.get(0)) {
                             case "info":

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 b6c35f2..7871e87 100644 (file)
--- 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 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);
                                        }
-                               }
+                               
                        }
                }
        }

diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst
index ed91732..09125a8 100644 (file)
--- a/docs/sections/release-notes.rst
+++ b/docs/sections/release-notes.rst
@@ -27,6 +27,9 @@ An important change, however, is that the AAF Locator requires internal K8s Apps
 **Bug Fixes**
        - `AAF-859 <https://jira.onap.org/browse/AAF-859>`_ Images hardcoded in AAF helm deployment yamls
 
+**Known Issues - solve in Frankfurt**
+        - `AAF-962 <https://jira.onap.org/browse/AAF-962>`_ AAF Certs could not generate...
+
 Version: 2.1.13 (Dublin, 4.0.0-ONAP)
 ---------------------------------------