From: varun gudisena <vg411h@att.com>
Date: Wed, 7 Feb 2018 16:40:59 +0000 (+0000)
Subject: Merge "sonar critical for Exception Handling"
X-Git-Tag: v1.1.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fmessagerouter%2Fmirroragent.git;a=commitdiff_plain;h=198d6471a33ea743fa006d34b00144fa94e9092f;hp=-c

Merge "sonar critical for Exception Handling"
---

198d6471a33ea743fa006d34b00144fa94e9092f
diff --combined src/main/java/com/att/nsa/dmaapMMAgent/MirrorMakerAgent.java
index 1c24273,b28fb07..e533a72
--- 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;
  
@@@ -175,7 -174,7 +175,7 @@@ public class MirrorMakerAgent 
  				try {
  					input.close();
  				} catch (IOException e) {
 -					e.printStackTrace();
 +					logger.error("Exception occurred is " +e);
  				}
  			}
  			if (out != null) {
@@@ -213,7 -212,6 +213,7 @@@
  					try {
  						Thread.sleep(1000);
  					} catch (InterruptedException e) {
 +						 Thread.currentThread().interrupt();
  					}
  					mirrorMakers.getListMirrorMaker().set(i, mm);
  				} else {
@@@ -254,7 -252,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 -282,6 +285,7 @@@
  			return response;
  
  		} catch (Exception e) {
 +			logger.error(" Exception Occered " + e);
  			return "ERROR:" + e.getLocalizedMessage();
  		}
  	}
@@@ -351,7 -347,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 -362,7 +366,7 @@@
  
  			}
  		} catch (Exception e) {
 -			e.printStackTrace();
 +			logger.error("Exception is : " +e);
  		}
  
  	}
@@@ -404,7 -400,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 -441,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);
  					}
  				}
  			}