From: varun gudisena <vg411h@att.com>
Date: Wed, 7 Feb 2018 16:41:18 +0000 (+0000)
Subject: Merge "sonar major for error-handling"
X-Git-Tag: v1.1.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=commitdiff_plain;h=82765e74a39c5f770e84f5fbe9bc285b404c0f78;hp=-c

Merge "sonar major for error-handling"
---

82765e74a39c5f770e84f5fbe9bc285b404c0f78
diff --combined src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index e533a72,e2bdeaf..ad1e20f
--- a/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
+++ b/src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
@@@ -36,7 -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;
  
@@@ -103,7 -102,7 +103,7 @@@ public class MirrorMakerAgent 
  				try {
  					input.close();
  				} catch (IOException e) {
 -					logger.error("IOException" + e);
 +					logger.error(" IOException occers " + e);
  				}
  			}
  		}
@@@ -153,7 -152,6 +153,7 @@@
  			}
  			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();
@@@ -183,7 -181,7 +183,7 @@@
  					out.close();
  				} catch (IOException e) {
  					e.printStackTrace();
- 					logger.error("IOException" + e);
+ 					logger.error("Exception is : "+e);
  				}
  			}
  		}
@@@ -213,7 -211,6 +213,7 @@@
  					try {
  						Thread.sleep(1000);
  					} catch (InterruptedException e) {
 +						 Thread.currentThread().interrupt();
  					}
  					mirrorMakers.getListMirrorMaker().set(i, mm);
  				} else {
@@@ -254,7 -251,6 +254,7 @@@
  				return topicMessage[0];
  			}
  		} catch (Exception e) {
 +			logger.error(" Exception Occered " + e);
  			return "ERROR:" + e.getMessage() + " Server Response is:" + response;
  		}
  		return null;
@@@ -285,7 -281,6 +285,7 @@@
  			return response;
  
  		} catch (Exception e) {
 +			logger.error(" Exception Occered " + e);
  			return "ERROR:" + e.getLocalizedMessage();
  		}
  	}
@@@ -351,7 -346,7 +351,7 @@@
  					} catch (Exception ex) {
  						connectionattempt++;
  						if (connectionattempt > 5) {
 -							logger.info("Can't connect to the topic, mmagent shutting down , " + topicMessage);
 +							logger.info("Can't connect to the topic, mmagent shutting down , " + topicMessage + ex);
  							return;
  						}
  						logger.info("Can't connect to the topic, " + topicMessage + " Retrying " + connectionattempt
@@@ -366,7 -361,7 +366,7 @@@
  
  			}
  		} catch (Exception e) {
- 			logger.error("Exception is : " +e);
+ 			logger.error("Exception at readAgentTopic : " + e);
  		}
  
  	}
@@@ -390,7 -385,7 +390,7 @@@
  		} else if (exists == false && mirrorMakers == null) {
  			mirrorMakers = new ListMirrorMaker();
  			ArrayList<MirrorMaker> list = mirrorMakers.getListMirrorMaker();
- 			list = new ArrayList<MirrorMaker>();
+ 			list = new ArrayList();
  			list.add(newMirrorMaker);
  			mirrorMakers.setListMirrorMaker(list);
  		}
@@@ -404,7 -399,7 +404,7 @@@
  			out = new FileOutputStream(mmagenthome + "/etc/mmagent.config");
  			mirrorMakerProperties.store(out, "");
  		} catch (IOException ex) {
 -			ex.printStackTrace();
 +			logger.error(" IOException Occered " + ex);
  		} finally {
  			if (out != null) {
  				try {
@@@ -445,17 -440,15 +445,17 @@@
  				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);
  					}
  				}
  			}
@@@ -499,7 -492,6 +499,7 @@@
  						out.close();
  					} catch (IOException e) {
  						e.printStackTrace();
 +						logger.error("IOException occered " + e);
  					}
  				}
  			}