Code Review
/
dmaap
/
messagerouter
/
mirroragent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes I38dad052,Ibc26d865
[dmaap/messagerouter/mirroragent.git]
/
src
/
main
/
java
/
com
/
att
/
nsa
/
dmaapMMAgent
/
MirrorMakerAgent.java
diff --git
a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index
35a64c3
..
0113f6d
100644
(file)
--- a/
src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
+++ b/
src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
@@
-36,6
+36,7
@@
import java.net.URL;
import java.util.ArrayList;
import java.util.Properties;
import java.util.ArrayList;
import java.util.Properties;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jasypt.util.text.BasicTextEncryptor;
import org.apache.log4j.Logger;
import org.jasypt.util.text.BasicTextEncryptor;
@@
-102,7
+103,7
@@
public class MirrorMakerAgent {
try {
input.close();
} catch (IOException e) {
try {
input.close();
} catch (IOException e) {
- logger.error("
IOException
" + e);
+ logger.error("
IOException occers
" + e);
}
}
}
}
}
}
@@
-123,7
+124,6
@@
public class MirrorMakerAgent {
input.close();
} catch (IOException e) {
logger.error("IOException" + e);
input.close();
} catch (IOException e) {
logger.error("IOException" + e);
- e.printStackTrace();
}
}
}
}
}
}
@@
-153,6
+153,7
@@
public class MirrorMakerAgent {
}
input = new FileInputStream(mmagenthome + "/etc/" + agentName + propName + ".properties");
} catch (IOException ex) {
}
input = new FileInputStream(mmagenthome + "/etc/" + agentName + propName + ".properties");
} catch (IOException ex) {
+ logger.error(" IOException will be handled " + ex);
try {
input = new FileInputStream(mmagenthome + "/etc/" + propName + ".properties");
Properties prop = new Properties();
try {
input = new FileInputStream(mmagenthome + "/etc/" + propName + ".properties");
Properties prop = new Properties();
@@
-167,14
+168,14
@@
public class MirrorMakerAgent {
prop.store(out, "");
} catch (Exception e) {
prop.store(out, "");
} catch (Exception e) {
-
e.printStackTrace(
);
+
logger.error("Exception at checkPropertiesFile " +e
);
}
} finally {
if (input != null) {
try {
input.close();
} catch (IOException e) {
}
} finally {
if (input != null) {
try {
input.close();
} catch (IOException e) {
-
e.printStackTrace(
);
+
logger.error("Exception occurred is " +e
);
}
}
if (out != null) {
}
}
if (out != null) {
@@
-182,6
+183,7
@@
public class MirrorMakerAgent {
out.close();
} catch (IOException e) {
e.printStackTrace();
out.close();
} catch (IOException e) {
e.printStackTrace();
+ logger.error("IOException" + e);
}
}
}
}
}
}
@@
-211,6
+213,7
@@
public class MirrorMakerAgent {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
mirrorMakers.getListMirrorMaker().set(i, mm);
} else {
}
mirrorMakers.getListMirrorMaker().set(i, mm);
} else {
@@
-361,7
+364,7
@@
public class MirrorMakerAgent {
}
} catch (Exception e) {
}
} catch (Exception e) {
-
e.printStackTrace(
);
+
logger.error("Exception is : " +e
);
}
}
}
}
@@
-440,15
+443,17
@@
public class MirrorMakerAgent {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ logger.log(Level.WARN, "Interrupted!", e);
+ Thread.currentThread().interrupt();
}
} catch (IOException ex) {
}
} catch (IOException ex) {
-
ex.printStackTrace(
);
+
logger.error(" IOException Occered " + ex
);
} finally {
if (out != null) {
try {
out.close();
} catch (IOException e) {
} finally {
if (out != null) {
try {
out.close();
} catch (IOException e) {
-
e.printStackTrace(
);
+
logger.error(" IOException Occered " + e
);
}
}
}
}
}
}
@@
-492,6
+497,7
@@
public class MirrorMakerAgent {
out.close();
} catch (IOException e) {
e.printStackTrace();
out.close();
} catch (IOException e) {
e.printStackTrace();
+ logger.error("IOException occered " + e);
}
}
}
}
}
}