Merge "sonar critical for Exception Handling"

[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 bd2a2a5..593544b 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 org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jasypt.util.text.BasicTextEncryptor;
 
@@ -102,7 +103,7 @@ public class MirrorMakerAgent {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       logger.error("IOException" + e);
+                                       logger.error(" IOException occers " + e);
                                }
                        }
                }
@@ -152,6 +153,7 @@ public class MirrorMakerAgent {
                        }
                        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();
@@ -173,7 +175,7 @@ public class MirrorMakerAgent {
                                try {
                                        input.close();
                                } catch (IOException e) {
-                                       e.printStackTrace();
+                                       logger.error("Exception occurred is " +e);
                                }
                        }
                        if (out != null) {
@@ -211,6 +213,7 @@ public class MirrorMakerAgent {
                                        try {
                                                Thread.sleep(1000);
                                        } catch (InterruptedException e) {
+                                                Thread.currentThread().interrupt();
                                        }
                                        mirrorMakers.getListMirrorMaker().set(i, mm);
                                } else {
@@ -251,6 +254,7 @@ public class MirrorMakerAgent {
                                return topicMessage[0];
                        }
                } catch (Exception e) {
+                       logger.error(" Exception Occered " + e);
                        return "ERROR:" + e.getMessage() + " Server Response is:" + response;
                }
                return null;
@@ -361,7 +365,7 @@ public class MirrorMakerAgent {
 
                        }
                } catch (Exception e) {
-                       e.printStackTrace();
+                       logger.error("Exception is : " +e);
                }
 
        }
@@ -440,15 +444,17 @@ public class MirrorMakerAgent {
                                try {
                                        Thread.sleep(1000);
                                } catch (InterruptedException e) {
+                                       logger.log(Level.WARN, "Interrupted!", e);
+                                       Thread.currentThread().interrupt();
                                }
                        } catch (IOException ex) {
-                               ex.printStackTrace();
+                               logger.error(" IOException Occered " + ex);
                        } finally {
                                if (out != null) {
                                        try {
                                                out.close();
                                        } catch (IOException e) {
-                                               e.printStackTrace();
+                                               logger.error(" IOException Occered " + e);
                                        }
                                }
                        }
@@ -492,6 +498,7 @@ public class MirrorMakerAgent {
                                                out.close();
                                        } catch (IOException e) {
                                                e.printStackTrace();
+                                               logger.error("IOException occered " + e);
                                        }
                                }
                        }