aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Benjamin <max.benjamin@att.com>2019-06-15 14:08:37 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-15 14:08:37 +0000
commit528f2b2de610108720b429ac546c67af265153f3 (patch)
treeafbc89d42acdded66f7378bb321e73565a360f9b
parent05c8e5d9746af57228ded504c746c9607eaee96f (diff)
parenta94ccb7d0cd952a6cce4ac87051375638bfbe464 (diff)
Merge "dmaap client using wrong auth property"
-rw-r--r--common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java b/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java
index 86d4aa7413..48c2d1495d 100644
--- a/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java
+++ b/common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java
@@ -49,12 +49,12 @@ public abstract class DmaapClient {
this.msoProperties = dmaapProperties.getProperties();
this.properties = new Properties();
this.properties.load(resource.getInputStream());
- try {
- this.properties.put("auth", CryptoUtils.decrypt(this.getAuth(), this.getKey()).getBytes());
- } catch (GeneralSecurityException e) {
- logger.error(e.getMessage(), e);
+ if (this.getAuth() != null && this.getKey() != null) {
+ this.properties.put("auth", this.getAuth());
+ this.properties.put("key", this.getKey());
+ } else {
+ logger.error("Dmaap auth or key is null");
}
- this.properties.put("key", this.getKey());
this.properties.put("topic", this.getTopic());
Optional<String> host = this.getHost();
if (host.isPresent()) {