[NEXUS-8855] only perform debug-level verification when logger.isDebugEnabled

Author: mcculls

components/nexus-core/src/main/java/org/sonatype/nexus/proxy/storage/remote/httpclient/HttpClientManagerImpl.java

@@ -230,56 +230,64 @@ public boolean isRedirected(final HttpRequest request, final HttpResponse respon
                 " from proxy " + proxyRepository + " but no location present");
           }
 
-          final String repoId = proxyRepository.getId();
+          boolean redirecting = true;
 
-          // Some complication here as it appears that something may be null, but its not clear what was null
-          URI sourceUri = ((HttpUriRequest) request).getURI();
-          if (!sourceUri.isAbsolute()) {
-            try {
-              sourceUri = URI.create(proxyRepository.getRemoteUrl()).resolve(sourceUri);
-            }
-            catch (Exception e) {
-              logger.debug("[{}] Problem resolving {} against {}", repoId, sourceUri, proxyRepository.getRemoteUrl());
+          final URI targetUri = createLocationURI(locationHeader.getValue());
+
+          // this logic below should trigger only for content fetches made by RRS retrieveItem
+          // hence, we do this ONLY if the HttpRequest is "marked" as such request
+          if (Boolean.TRUE == context.getAttribute(HttpClientRemoteStorage.CONTENT_RETRIEVAL_MARKER_KEY)) {
+            if (targetUri.getPath().endsWith("/")) {
+              redirecting = false;
             }
           }
 
-          final String sourceScheme = schemeOf(sourceUri);
-          final String sourceHost = hostOf(sourceUri);
+          // Additional verification when debugging...
 
-          final URI targetUri = createLocationURI(locationHeader.getValue());
+          if (logger.isDebugEnabled()) {
+            final String repoId = proxyRepository.getId();
+
+            URI sourceUri = ((HttpUriRequest) request).getURI();
+            if (!sourceUri.isAbsolute()) {
+              try {
+                sourceUri = URI.create(proxyRepository.getRemoteUrl()).resolve(sourceUri);
+              }
+              catch (Exception e) {
+                logger.debug("[{}] Problem resolving {} against {}", repoId, sourceUri, proxyRepository.getRemoteUrl());
+              }
+            }
 
-          final String targetScheme = schemeOf(targetUri);
-          final String targetHost = hostOf(targetUri);
+            final String sourceScheme = schemeOf(sourceUri);
+            final String sourceHost = hostOf(sourceUri);
 
-          final int redirectCode = response.getStatusLine().getStatusCode();
+            final String targetScheme = schemeOf(targetUri);
+            final String targetHost = hostOf(targetUri);
 
-          // nag about redirection peculiarities, in any case
-          if (!Objects.equals(sourceScheme, targetScheme)) {
-            if ("http".equals(targetScheme)) {
-              // security risk: HTTPS > HTTP downgrade, you are not safe as you think!
-              logger.debug("[{}] Downgrade from HTTPS to HTTP during {} redirect {} -> {}",
-                  repoId, redirectCode, sourceUri, targetUri);
-            }
-            else if ("https".equals(targetScheme) && Objects.equals(sourceHost, targetHost)) {
-              // misconfiguration: your repository configured with wrong protocol and causes performance problems?
-              logger.debug("[{}] Protocol upgrade during {} redirect on same host {} -> {}",
-                  repoId, redirectCode, sourceUri, targetUri);
+            final int redirectCode = response.getStatusLine().getStatusCode();
+
+            // nag about redirection peculiarities, in any case
+            if (!Objects.equals(sourceScheme, targetScheme)) {
+              if ("http".equals(targetScheme)) {
+                // security risk: HTTPS > HTTP downgrade, you are not safe as you think!
+                logger.debug("[{}] Downgrade from HTTPS to HTTP during {} redirect {} -> {}", repoId, redirectCode,
+                    sourceUri, targetUri);
+              }
+              else if ("https".equals(targetScheme) && Objects.equals(sourceHost, targetHost)) {
+                // misconfiguration: your repository configured with wrong protocol and causes performance problems?
+                logger.debug("[{}] Protocol upgrade during {} redirect on same host {} -> {}", repoId, redirectCode,
+                    sourceUri, targetUri);
+              }
             }
-          }
 
-          // this logic below should trigger only for content fetches made by RRS retrieveItem
-          // hence, we do this ONLY if the HttpRequest is "marked" as such request
-          if (Boolean.TRUE == context.getAttribute(HttpClientRemoteStorage.CONTENT_RETRIEVAL_MARKER_KEY)) {
-            if (targetUri.getPath().endsWith("/")) {
-              logger.debug("[{}] Not following {} redirect to index {} -> {}",
-                  repoId, redirectCode, sourceUri, targetUri);
-              return false;
+            if (redirecting) {
+              logger.debug("[{}] Following {} redirect {} -> {}", repoId, redirectCode, sourceUri, targetUri);
+            }
+            else {
+              logger.debug("[{}] Not following {} redirect {} -> {}", repoId, redirectCode, sourceUri, targetUri);
             }
           }
 
-          logger.debug("[{}] Following {} redirect {} -> {}",
-              repoId, redirectCode, sourceUri, targetUri);
-          return true;
+          return redirecting;
         }
 
         return false;