diff options
| author |   varun gudisena <vg411h@att.com> | 2018-09-04 22:37:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-04 22:37:11 +0000 |
| commit | dde5c600507bd746b6978ab5e1058a894fb6bef7 (patch) | |
| tree | 85fd17bb7eb246d89ddf2672957e45273ac0ce13 | |
| parent | b809e5df951fa8d1de40aebbce862da6436fc2fe (diff) | |
| parent | 7c124804fa5227859838d4466718bd2e74dbabde (diff) | |
Merge "Fix delete of feed pubs and subs"
| -rw-r--r-- | pom.xml | 9 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java | 3 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java | 2 |
3 files changed, 2 insertions, 12 deletions
@@ -208,15 +208,6 @@ <version>${jackson.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> -<!-- for DMAAP-205, a point release on the common version - addresses a security issue. Note the add notation here - <version>${jackson.version}.1</version> - --> - <version>${jackson.version}</version> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> <version>${jackson.version}</version> diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java index 8b3a4c4..34d36ba 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java @@ -831,12 +831,11 @@ public class DrProvConnection extends BaseLoggingClass { } } } + err.setCode(rc); if (rc == 204 ) { responseBody = bodyToString( uc.getInputStream() ); logger.info( "responseBody=" + responseBody ); - } else { - err.setCode(rc); err.setMessage(responsemessage); } diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java index 06319de..bcdb4b3 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java +++ b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java @@ -196,7 +196,7 @@ public class DR_PubResource extends BaseLoggingClass { for( Iterator<DR_Pub> i = pubs.iterator(); i.hasNext(); ) { DR_Pub listItem = i.next(); if ( listItem.getPubId().equals(id)) { - pubs.remove( listItem ); + i.remove(); } } fnew.setPubs(pubs); |