Author: stevel
Date: Thu Sep 7 08:27:45 2006
New Revision: 441117
URL: http://svn.apache.org/viewvc?view=rev&rev=441117
Log:
move other java1.5+ check down to the other java1.5 proxy tests.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java?view=diff&rev=441117&r1=441116&r2=441117
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java Thu Sep 7
08:27:45 2006
@@ -582,9 +582,6 @@
* @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 @@
if (JavaEnvUtils.getJavaVersionNumber() < 15) {
return;
}
+ printProperty(out, ProxySetup.USE_SYSTEM_PROXIES);
final String proxyDiagClassname
= "org.apache.tools.ant.util.java15.ProxyDiagnostics";
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
