From: Ram Koya <rk541m@att.com>
Date: Tue, 4 Sep 2018 13:11:42 +0000 (+0000)
Subject: Merge "MrTopicConnection.java: Fixed sonar issue"
X-Git-Tag: 1.0.16~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fbcfeaab1d5ef0cecb0c4212b8ec9088d2408e38;hp=bf1c4acfaa70c7b3ac5f205b3d13c29d8b52c776;p=dmaap%2Fdbcapi.git

Merge "MrTopicConnection.java: Fixed sonar issue"
---

diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
index 18fdeba..492037c 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
@@ -33,7 +33,6 @@ import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLException;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
 import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
 import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.MR_Cluster;
@@ -81,7 +80,7 @@ public class MrTopicConnection extends BaseLoggingClass  {
 			return(true);
 		} catch (Exception e) {
             logger.error("Unexpected error during openConnection of " + pURL );
-            e.printStackTrace();
+            logger.error("Error", e);;
             return(false);
         }
 
@@ -97,7 +96,7 @@ public class MrTopicConnection extends BaseLoggingClass  {
 			return(true);
 		} catch (Exception e) {
             logger.error("Unexpected error during openConnection of " + pURL );
-            e.printStackTrace();
+            logger.error("error", e);
             return(false);
         }
 
@@ -147,13 +146,10 @@ public class MrTopicConnection extends BaseLoggingClass  {
 
             } catch (ProtocolException pe) {
                  // Rcvd error instead of 100-Continue
-                 try {
-                     // work around glitch in Java 1.7.0.21 and likely others
-                     // without this, Java will connect multiple times to the server to run the same request
-                     uc.setDoOutput(false);
-                 } catch (Exception e) {
-                 }
+            	callSetDoOutputOnError();
+                 
             }  catch ( SSLException se ) {
+            	logger.error("Error", se);
         		response.setCode(500);
     			response.setMessage( se.getMessage());
     			return response;
@@ -194,16 +190,28 @@ public class MrTopicConnection extends BaseLoggingClass  {
 				response.setCode(500);
 				response.setMessage( "Unable to read response");
 				logger.warn( response.getMessage() );
-            	e.printStackTrace();
+            	logger.error("Error", e);
 			}
         }
 		finally {
 			try {
 				uc.disconnect();
-			} catch ( Exception e ) {}
+			} catch ( Exception e ) {
+				logger.error("Error", e);
+			}
 		}
 		return response;
 
 	}
+	
+	public void callSetDoOutputOnError() {
+		try {
+            // work around glitch in Java 1.7.0.21 and likely others
+            // without this, Java will connect multiple times to the server to run the same request
+            uc.setDoOutput(false);
+        } catch (Exception e) {
+       	 	logger.error("Error", e);
+        }
+	}
 
 }