[DMAAP-MR] Remove acl update for deny

[dmaap/messagerouter/messageservice.git] / src / main / java / org / onap / dmaap / dmf / mr / service / impl / TopicServiceImpl.java

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
index 92aea97..386fb97 100644 (file)
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
@@ -444,9 +444,13 @@ public class TopicServiceImpl implements TopicService {
                        throw new TopicExistsException("Failed to revoke write access to producer [" + producerId
                                        + "] for topic. Topic [" + topicName + "] does not exist.");
                }
-               topic.denyWritesFromUser(producerId, user);
-               LOGGER.info("Write access has been revoked to producer [" + producerId + "] for topic [" + topicName
+               if (isUseCustomAcls()) {
+                       topic.denyWritesFromUser(producerId, user);
+                       LOGGER.info("Write access has been revoked to producer [" + producerId + "] for topic [" + topicName
                                + "]. Sending response.");
+               } else {
+                       LOGGER.info("Ignoring acl update");
+               }
                respondOk(dmaapContext, "Write access has been revoked for publisher.");
        }
 
@@ -500,9 +504,13 @@ public class TopicServiceImpl implements TopicService {
                        throw new TopicExistsException("Failed to permit read access to consumer [" + consumerId
                                        + "] for topic. Topic [" + topicName + "] does not exist.");
                }
-               topic.denyReadsByUser(consumerId, user);
-               LOGGER.info("Read access has been revoked to consumer [" + consumerId + "] for topic [" + topicName
+               if (isUseCustomAcls()) {
+                       topic.denyReadsByUser(consumerId, user);
+                       LOGGER.info("Read access has been revoked to consumer [" + consumerId + "] for topic [" + topicName
                                + "]. Sending response.");
+               } else {
+                       LOGGER.info("Ignoring acl update");
+               }
                respondOk(dmaapContext,
                                "Read access has been revoked for consumer [" + consumerId + "] for topic [" + topicName + "].");