Fix delete of feed pubs and subs

Change-Id: Ie5105d9d3f12efd23f2e67338c742ffc57e65d94
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-656

diff --git a/pom.xml b/pom.xml
index 0667768..1349351 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -207,15 +207,6 @@
                        <artifactId>jackson-annotations</artifactId>
                        <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>

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 (file)
--- 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 (file)
--- 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);