summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-09-04 18:29:29 -0400
committerdglFromAtt <dgl@research.att.com>2018-09-04 18:29:46 -0400
commit7c124804fa5227859838d4466718bd2e74dbabde (patch)
treeb2427bf7c33c8edbbdf2f8c0932557ffc753d0f7
parent6c40168474af445daa4776108787e4cc5f73a26b (diff)
Fix delete of feed pubs and subs
Change-Id: Ie5105d9d3f12efd23f2e67338c742ffc57e65d94 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-656
-rw-r--r--pom.xml9
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java3
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/resources/DR_PubResource.java2
3 files changed, 2 insertions, 12 deletions
diff --git a/pom.xml b/pom.xml
index 0667768..1349351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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);