You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/09/05 14:48:48 UTC

svn commit: r440335 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/Diagnostics.java

Author: peterreilly
Date: Tue Sep  5 05:48:48 2006
New Revision: 440335

URL: http://svn.apache.org/viewvc?view=rev&rev=440335
Log:
fix for diagnostics using java 1.4

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=440335&r1=440334&r2=440335
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Sep  5 05:48:48 2006
@@ -14,6 +14,7 @@
   Bugzilla report 40207.
 * Macro element did not include top level Text. Bugzilla report 36803.
 * AntClassLoader did not isolate resources when isolate was set. Bugzilla report 38747.
+* Diagnostics broken when using java 1.4. Bugzilla report 40395.
 
 Other changes:
 --------------

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=440335&r1=440334&r2=440335
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java Tue Sep  5 05:48:48 2006
@@ -600,8 +600,12 @@
         printProperty(out, ProxySetup.SOCKS_PROXY_PORT);
         printProperty(out, ProxySetup.SOCKS_PROXY_USERNAME);
         printProperty(out, ProxySetup.SOCKS_PROXY_PASSWORD);
-        
-        final String proxyDiagClassname="org.apache.tools.ant.util.java15.ProxyDiagnostics";
+
+        if (JavaEnvUtils.getJavaVersionNumber() < 15) {
+            return;
+        }
+        final String proxyDiagClassname
+            = "org.apache.tools.ant.util.java15.ProxyDiagnostics";
         try {
             Class proxyDiagClass = Class.forName(proxyDiagClassname);
             Object instance =proxyDiagClass.newInstance();
@@ -611,12 +615,11 @@
             //not included, do nothing
         } catch (IllegalAccessException e) {
             //not included, do nothing
-
         } catch (InstantiationException e) {
             //not included, do nothing
-
+        } catch (NoClassDefFoundError e) {
+            // not included, to nothing
         }
-
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org