aboutsummaryrefslogtreecommitdiffstats
path: root/datarouter-node/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'datarouter-node/src/main')
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java2
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index eb79b563..55ad6aa8 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@ -117,7 +117,7 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
String header = line.substring(0, index);
String headerValue = line.substring(index + 1);
if ("x-dmaap-dr-routing".equalsIgnoreCase(header)) {
- subid = headerValue.replaceAll("[^ ]*/", "");
+ subid = headerValue.replaceAll("[^ ]*/+", "");
feedid = deliveryTaskHelper.getFeedId(subid.replaceAll(" .*", ""));
}
if (length == 0 && header.toLowerCase().startsWith("content-")) {
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index 37e5db60..2c8dcdb0 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -99,14 +99,14 @@ public class NodeUtils {
*/
public static String getNodeAuthHdr(String node, String key) {
try {
- MessageDigest md = MessageDigest.getInstance("SHA");
+ MessageDigest md = MessageDigest.getInstance("SHA-512");
md.update(key.getBytes());
md.update(node.getBytes());
md.update(key.getBytes());
return (getAuthHdr(node, base64Encode(md.digest())));
} catch (Exception exception) {
eelfLogger
- .error("Exception in generating Credentials for given node name:= " + exception.toString(),
+ .error("Exception in generating Credentials for given node name:= " + exception.getMessage(),
exception);
return (null);
}