From 422d55a338cb9c45364aad4d3e2b5a515340cbb1 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@apache.org>
Date: Thu, 1 Nov 2007 14:06:39 +0000
Subject: [PATCH] defect 38732; rmic task doesn't work with -Xnew and JDK 6.0

turning the test off on java6, as it damages the XML parser

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@591013 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/rmic/rmic.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml
index 24283f02b..7c918d77d 100644
--- a/src/etc/testcases/taskdefs/rmic/rmic.xml
+++ b/src/etc/testcases/taskdefs/rmic/rmic.xml
@@ -117,7 +117,7 @@
     <condition property="rmic6.present">
       <and>
         <isset property="rmic.present"/>
-        <available classname="java.util.Service"/>
+        <available classname="java.util.ServiceLoader"/>
       </and>
     </condition>
   </target>
@@ -278,7 +278,10 @@
     <assertBaseCompiled/>
   </target>
 
-  <target name="testXnew" if="rmic5.present" depends="init">
+  <!--
+  This test stamps on the XML parser settings on java6, so it is disabled.
+  -->
+  <target name="testXnew" if="rmic5.present" unless="rmic6.present" depends="init">
     <base-rmic compiler="sun">
       <compilerarg value="-Xnew"/>
     </base-rmic>