Improve Batches

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / update / Remove.java

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 dad03ce..7a30dc5 100644 (file)
--- 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
@@ -138,6 +138,8 @@ public class Remove extends Batch {
                                                                        if(!ur.get()) {
                                                                                ur.set(true);
                                                                        }
+                                                                       //TODO If deleted because Role is no longer there, double check...
+                                                                       
                                                                        UserRole.batchDelete(cbl.inc(),row);
                                                                        hdd.target=UserRoleDAO.TABLE; 
                                                                        hdd.subject=UserRole.histSubject(row);
@@ -158,8 +160,8 @@ public class Remove extends Batch {
                                                                        if(!x509.get()) {
                                                                                x509.set(true);
                                                                        }
-                                                                       X509.row(cbl.inc(),row);
-                                                                       hdd.target=CertDAO.TABLE; 
+                                                                       X509.batchDelete(cbl.inc(),row);
+                                                                       hdd.target="x509"; 
                                                                        hdd.subject=X509.histSubject(row);
                                                                        hdd.memo=X509.histMemo(memoFmt.get(),row);
                                                                        historyDAO.createBatch(cbl.inc(), hdd);