X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fupdate%2FRemove.java;h=7c516b10899e8695f5049886bd99bbdf04aecee2;hb=refs%2Fchanges%2F93%2F98293%2F1;hp=087ab952f7aac7059cf4bd3b63444ac4b09cc6cc;hpb=6dd9704640eb8cc8d6b4ccd266e40a3f6f589e75;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
index 087ab952..7c516b10 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/Remove.java
@@ -94,7 +94,14 @@ public class Remove extends Batch {
                 remove.add(new File(logDir, args()[i]));
             }
         } else {
-            remove.add(new File(logDir,"Delete"+Chrono.dateOnlyStamp()+".csv"));
+        	final String ending = Chrono.dateOnlyStamp()+".csv";
+        	for (File file : logDir.listFiles(f -> {
+	        		String name = f.getName();
+					return name.endsWith(ending) && (
+							name.startsWith("Delete") || name.startsWith("Clean."));
+	        		}))  {
+        		remove.add(file);
+        	};
         }
 
         for(File f : remove) {
@@ -104,7 +111,7 @@ public class Remove extends Batch {
         final Holder<Boolean> ur = new Holder<>(false);
         final Holder<Boolean> cred = new Holder<>(false);
         final Holder<Boolean> x509 = new Holder<>(false);
-        final Holder<String> memoFmt = new Holder<String>("");
+        final Holder<String> memoFmt = new Holder<>("");
         final HistoryDAO.Data hdd = new HistoryDAO.Data();
         final String orgName = trans.org().getName();