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 (file)
--- 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 (file)
--- 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();