X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fatt%2Fnsa%2FdmaapMMAgent%2FMirrorMakerAgent.java;h=5c2b669804f866489b00efc4b3fe4a4a09c5a6ca;hp=d0237f123ffec3c7d5e135861325eb4c81ea3bf1;hb=5bfc6f5403afbb0c442d4f1a377e016c83503091;hpb=adf340af7852891c7c89b146cf9a272e57ddd825

diff --git a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index d0237f1..5c2b669 100644
--- 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();
@@ -166,14 +168,14 @@ public class MirrorMakerAgent {
 				prop.store(out, "");
 
 			} catch (Exception e) {
-				e.printStackTrace();
+				logger.error("Exception at checkPropertiesFile " +e);
 			}
 		} finally {
 			if (input != null) {
 				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;
@@ -281,6 +285,7 @@ public class MirrorMakerAgent {
 			return response;
 
 		} catch (Exception e) {
+			logger.error(" Exception Occered " + e);
 			return "ERROR:" + e.getLocalizedMessage();
 		}
 	}
@@ -361,7 +366,7 @@ public class MirrorMakerAgent {
 
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Exception is : " +e);
 		}
 
 	}
@@ -440,15 +445,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 +499,7 @@ public class MirrorMakerAgent {
 						out.close();
 					} catch (IOException e) {
 						e.printStackTrace();
+						logger.error("IOException occered " + e);
 					}
 				}
 			}