Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Aaf cleanup in TopicService implementation
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
service
/
TopicService.java
diff --git
a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
index
3386b97
..
2065754
100644
(file)
--- a/
src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/
src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@
-246,11
+246,16
@@
public class TopicService extends BaseLoggingClass {
apiError.setFields("fqtn");
return null;
}
apiError.setFields("fqtn");
return null;
}
+
+ ApiError topicSetupError = aafTopicSetupService.aafTopicCleanup(topic);
+ updateApiError(apiError, topicSetupError);
+ if (apiError.getCode() >= 400) {
+ return null;
+ }
+
ArrayList<MR_Client> clients = new ArrayList<MR_Client>(clientService.getAllMrClients(pubId));
for (Iterator<MR_Client> it = clients.iterator(); it.hasNext(); ) {
MR_Client c = it.next();
ArrayList<MR_Client> clients = new ArrayList<MR_Client>(clientService.getAllMrClients(pubId));
for (Iterator<MR_Client> it = clients.iterator(); it.hasNext(); ) {
MR_Client c = it.next();
-
-
clientService.removeMr_Client(c.getMrClientId(), false, apiError);
if (!apiError.is2xx()) {
return null;
clientService.removeMr_Client(c.getMrClientId(), false, apiError);
if (!apiError.is2xx()) {
return null;