Merge "sonar critical for Exception Handling"
authorvarun gudisena <vg411h@att.com>
Wed, 7 Feb 2018 16:40:54 +0000 (16:40 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 7 Feb 2018 16:40:54 +0000 (16:40 +0000)
1  2 
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) {
                                        try {
                                                Thread.sleep(1000);
                                        } catch (InterruptedException e) {
 +                                               Thread.currentThread().interrupt();
                                        }
                                        mirrorMakers.getListMirrorMaker().set(i, mm);
                                } else {
                                return topicMessage[0];
                        }
                } catch (Exception e) {
 +                      logger.error(" Exception Occered " + e);
                        return "ERROR:" + e.getMessage() + " Server Response is:" + response;
                }
                return null;
                        return response;
  
                } catch (Exception e) {
 +                      logger.error(" Exception Occered " + e);
                        return "ERROR:" + e.getLocalizedMessage();
                }
        }
                                        } 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
  
                        }
                } catch (Exception e) {
 -                      e.printStackTrace();
 +                      logger.error("Exception is : " +e);
                }
  
        }
                                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);
                                        }
                                }
                        }