ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers CompilerAdapterFactory.java
Date Thu, 30 Sep 2004 12:42:58 GMT
bodewig     2004/09/30 05:42:58

  Modified:    src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_16_BRANCH CompilerAdapterFactory.java
  Log:
  Merge fix for PR 31450 from HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.21.2.6  +5 -2      ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.21.2.5
  retrieving revision 1.21.2.6
  diff -u -r1.21.2.5 -r1.21.2.6
  --- CompilerAdapterFactory.java	9 Mar 2004 17:01:38 -0000	1.21.2.5
  +++ CompilerAdapterFactory.java	30 Sep 2004 12:42:58 -0000	1.21.2.6
  @@ -140,8 +140,11 @@
               return true;
           } catch (ClassNotFoundException cnfe) {
               try {
  -                CompilerAdapterFactory.class.getClassLoader().loadClass(MODERN_COMPILER);
  -                return true;
  +                ClassLoader cl = CompilerAdapterFactory.class.getClassLoader();
  +                if (cl != null) {
  +                    cl.loadClass(MODERN_COMPILER);
  +                    return true;
  +                }
               } catch (ClassNotFoundException cnfe2) {
               }
           }
  
  
  

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


Mime
View raw message