ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
Date Tue, 07 Dec 2004 10:30:35 GMT
peterreilly    2004/12/07 02:30:35

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
                        ANT_16_BRANCH JUnitTask.java
  Log:
  sync
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.146 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.145
  retrieving revision 1.503.2.146
  diff -u -r1.503.2.145 -r1.503.2.146
  --- WHATSNEW	1 Dec 2004 14:04:36 -0000	1.503.2.145
  +++ WHATSNEW	7 Dec 2004 10:30:35 -0000	1.503.2.146
  @@ -72,6 +72,9 @@
   * Target location is not set for default target.
     Bugzilla report 32267.
   
  +* Incorrect classloader parent in junittask when using with ant-junit.jar and junit.jar
  +  not in the project classloader. Bugzilla report 28474.
  +
   Changes from Ant 1.6.1 to Ant 1.6.2
   ===================================
   
  
  
  
  No                   revision
  No                   revision
  1.83.2.16 +5 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.83.2.15
  retrieving revision 1.83.2.16
  diff -u -r1.83.2.15 -r1.83.2.16
  --- JUnitTask.java	6 Oct 2004 15:48:29 -0000	1.83.2.15
  +++ JUnitTask.java	7 Dec 2004 10:30:35 -0000	1.83.2.16
  @@ -1272,6 +1272,10 @@
                       classpath.append(antRuntimeClasses);
                   }
                   classLoader = getProject().createClassLoader(classpath);
  +                if (getClass().getClassLoader() != null
  +                    && getClass().getClassLoader() != Project.class.getClassLoader())
{
  +                    classLoader.setParent(getClass().getClassLoader());
  +                }
                   classLoader.setParentFirst(false);
                   classLoader.addJavaLibraries();
                   log("Using CLASSPATH " + classLoader.getClasspath(), 
  
  
  

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


Mime
View raw message