Fix sonar issues in dmaap/messagerouter/msgrtr

Fix Remove this throw statement from this finally block issue
Fix Cast one of the operands of this multiplication operation to a "long" issue

Issue-ID: DMAAP-894
Change-Id: Ibd0f9a04e409f0de05e8cf42695188b0e8a1f201
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
index 0a909ff..63e065f 100644 (file)
--- a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java
@@ -221,7 +221,7 @@ public class DMaaPKafkaConsumerFactory implements ConsumerFactory {
                                                try {
                                                        ipLock.release();
                                                } catch (Exception e) {
-                                                       throw new UnavailableException("Error while releasing consumer factory lock" + e, e);
+                                                       log.error("Error while releasing consumer factory lock", e);
                                                }
                                        }
                                }

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java
index 82ff80a..0ab80c4 100644 (file)
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java
@@ -435,7 +435,7 @@ public class MMServiceImpl implements MMService {
                // start processing, building a batch to push to the backend
                final long startMs = System.currentTimeMillis();
                long count = 0;
-               long maxEventBatch = 1024 * 16;
+        long maxEventBatch = 1024L * 16L;
                String evenlen = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, BATCH_LENGTH);
                if (null != evenlen)
                        maxEventBatch = Long.parseLong(evenlen);