diff options
| author |   Boslet, Cory <cory.boslet@att.com> | 2019-06-14 09:44:54 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-06-14 09:45:00 -0400 |
| commit | a94ccb7d0cd952a6cce4ac87051375638bfbe464 (patch) | |
| tree | ce33917ad9d748f41bd85f2e04183943daf410a3 /common/src/main | |
| parent | 1f8aa8ef6deade96a53fa57c28d1aacab6cf7e5e (diff) | |
dmaap client using wrong auth property
Changed dmaap client to set auth property correctly to prevent double
decryting and wrong value
Change-Id: I83dc8c67e94a8bec187c056e7dfa1f966cc5ee3c
Issue-ID: SO-2019
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'common/src/main')
| -rw-r--r-- | common/src/main/java/org/onap/so/client/dmaap/DmaapClient.java | 10 |
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()) { |