From: Ram Koya Date: Wed, 20 Jun 2018 21:24:37 +0000 (+0000) Subject: Merge "changes for kafka upgrade" X-Git-Tag: 1.1.1~15 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=commitdiff_plain;h=75c91227e8ee8811a4d3f03ef8e5e730552b8d5a;hp=1ee517bedb7c1634e37c1124676f001b95840985 Merge "changes for kafka upgrade" --- diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java b/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java index 234f0f0..b529360 100644 --- a/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/dao/CreateMirrorMaker.java @@ -23,14 +23,14 @@ package com.att.nsa.dmaapMMAgent.dao; public class CreateMirrorMaker { String messageID; - MirrorMaker createMirrorMaker; + MirrorMaker MirrorMaker; public MirrorMaker getCreateMirrorMaker() { - return createMirrorMaker; + return MirrorMaker; } public void setCreateMirrorMaker(MirrorMaker createMirrorMaker) { - this.createMirrorMaker = createMirrorMaker; + this.MirrorMaker = createMirrorMaker; } public String getMessageID() { diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java index e4a0b97..215323e 100644 --- a/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java +++ b/src/main/java/com/att/nsa/dmaapMMAgent/utils/MirrorMakerProcessHandler.java @@ -152,6 +152,7 @@ public class MirrorMakerProcessHandler {/* + "_MMaker.log"; final Process process = rt.exec(args); new Thread() { + @Override public void run() { try { InputStream is = process.getInputStream();