1 files changed, 30 insertions, 49 deletions
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
index 182d198013..25659ddd92 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/SSLProxyServlet.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,60 +34,41 @@ import javax.servlet.ServletException;
 
 public abstract class SSLProxyServlet extends ProxyServlet {
 
-	private static final long serialVersionUID = 1L;
-	private static Logger log = LoggerFactory.getLogger(SSLProxyServlet.class.getName());
+    private static final long serialVersionUID = 1L;
+    private static final int TIMEOUT = 600000;
+    private static Logger log = LoggerFactory.getLogger(SSLProxyServlet.class.getName());
 
-	//TODO If no problems will arise remove in next merge
-    /*@Override
-    protected void sendProxyRequest(HttpServletRequest clientRequest, HttpServletResponse proxyResponse, Request proxyRequest) {
-        // Add Missing Headers to proxy request
-        @SuppressWarnings("unchecked")
-        Enumeration<String> headerNames = clientRequest.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String headerName = headerNames.nextElement();
-            if (!proxyRequest.getHeaders().containsKey(headerName)) {
-                String headerVal = clientRequest.getHeader(headerName);
-                log.debug("Adding missing header to request,  header name: {} , header value: {}", headerName,
-                        headerVal);
-                proxyRequest.header(headerName, headerVal);
-            }
-        }
-        proxyRequest.getHeaders().remove(HttpHeader.HOST);
-
-        super.sendProxyRequest(clientRequest, proxyResponse, proxyRequest);
-    }*/
+    @Override
+    protected HttpClient createHttpClient() throws ServletException {
+        Configuration config = ((ConfigurationManager) getServletConfig().getServletContext()
+                .getAttribute(Constants.CONFIGURATION_MANAGER_ATTR)).getConfiguration();
+        boolean isSecureClient = !config.getBeProtocol().equals(BeProtocol.HTTP.getProtocolName());
+        HttpClient client = (isSecureClient) ? getSecureHttpClient() : super.createHttpClient();
+        setTimeout(TIMEOUT);
+        client.setIdleTimeout(TIMEOUT);
+        client.setStopTimeout(TIMEOUT);
 
-	@Override
-	protected HttpClient createHttpClient() throws ServletException {
-		Configuration config = ((ConfigurationManager) getServletConfig().getServletContext()
-				.getAttribute(Constants.CONFIGURATION_MANAGER_ATTR)).getConfiguration();
-		boolean isSecureClient = !config.getBeProtocol().equals(BeProtocol.HTTP.getProtocolName());
-		HttpClient client = (isSecureClient) ? getSecureHttpClient() : super.createHttpClient();
-		setTimeout(600000);
-		client.setIdleTimeout(600000);
-		client.setStopTimeout(600000);
+        return client;
+    }
 
-		return client;
-	}
+    private HttpClient getSecureHttpClient() throws ServletException {
+        // Instantiate and configure the SslContextFactory
+        SslContextFactory sslContextFactory = new SslContextFactory(true);
 
-	private HttpClient getSecureHttpClient() throws ServletException {
-		// Instantiate and configure the SslContextFactory
-		SslContextFactory sslContextFactory = new SslContextFactory(true);
+        // Instantiate HttpClient with the SslContextFactory
+        HttpClient httpClient = new HttpClient(sslContextFactory);
 
-		// Instantiate HttpClient with the SslContextFactory
-		HttpClient httpClient = new HttpClient(sslContextFactory);
+        // Configure HttpClient, for example:
+        httpClient.setFollowRedirects(false);
 
-		// Configure HttpClient, for example:
-		httpClient.setFollowRedirects(false);
-
-		// Start HttpClient
-		try {
-			httpClient.start();
-		} catch (Exception x) {
+        // Start HttpClient
+        try {
+            httpClient.start();
+        } catch (Exception x) {
             log.error("Exception thrown while starting httpClient {}", x);
-			throw new ServletException(x);
-		}
+            throw new ServletException(x);
+        }
 
         return httpClient;
-	}
+    }
 }