From ff5195fa54146617ec5805b9e2863bc1dcb8d150 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Thu, 7 Sep 2006 15:27:45 +0000 Subject: [PATCH] move other java1.5+ check down to the other java1.5 proxy tests. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@441117 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Diagnostics.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index f4a376922..d58c429b9 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -582,9 +582,6 @@ public final class Diagnostics { * @param out stream to print to */ private static void doReportProxy(PrintStream out) { - if(JavaEnvUtils.getJavaVersionNumber()>=15) { - printProperty(out, ProxySetup.USE_SYSTEM_PROXIES); - } printProperty(out,ProxySetup.HTTP_PROXY_HOST); printProperty(out, ProxySetup.HTTP_PROXY_PORT); printProperty(out, ProxySetup.HTTP_PROXY_USERNAME); @@ -604,6 +601,7 @@ public final class Diagnostics { if (JavaEnvUtils.getJavaVersionNumber() < 15) { return; } + printProperty(out, ProxySetup.USE_SYSTEM_PROXIES); final String proxyDiagClassname = "org.apache.tools.ant.util.java15.ProxyDiagnostics"; try {