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=7a30dc5fd1319f9a0c647d766f39019ca31e5bc1;hb=a174f8ddbc5eb78a648fb68b33ef18cb64d81fda;hp=dad03ce52c4e394c4fb761e2dce7bbe6e7ebc015;hpb=4c709df6500a95057a92ec3ea5c739738764388d;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 dad03ce5..7a30dc5f 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
@@ -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);