brett       2005/03/20 21:26:32

  Modified:    maven-mboot2/src/main/java/compile JavacCompiler.java
               maven-mboot2/src/main/java MBoot.java
  Log:
  fix error handling in javac if there is some other failure (eg bad parameters)
  
  Revision  Changes    Path
  1.4       +7 -2      
maven-components/maven-mboot2/src/main/java/compile/JavacCompiler.java
  
  Index: JavacCompiler.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-mboot2/src/main/java/compile/JavacCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavacCompiler.java        16 Mar 2005 23:17:38 -0000      1.3
  +++ JavacCompiler.java        21 Mar 2005 05:26:32 -0000      1.4
  @@ -17,6 +17,8 @@
   
   package compile;
   
  +import util.IsolatedClassLoader;
  +
   import java.io.BufferedReader;
   import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
  @@ -33,8 +35,6 @@
   import java.util.NoSuchElementException;
   import java.util.StringTokenizer;
   
  -import util.IsolatedClassLoader;
  -
   public class JavacCompiler
       extends AbstractCompiler
   {
  @@ -107,6 +107,11 @@
   
           Boolean ok = (Boolean) compile.invoke( compiler, new Object[] { 
args.toArray( new String[0] ) } );
   
  +        if ( !ok.booleanValue() )
  +        {
  +            throw new Exception( "Failure executing javac: \n\t" + 
err.toString() );
  +        }
  +
           List messages = parseModernStream( new BufferedReader( new 
InputStreamReader( new ByteArrayInputStream( err.toByteArray() ) ) ) );
   
           return messages;
  
  
  
  1.73      +0 -0      maven-components/maven-mboot2/src/main/java/MBoot.java
  
  
  
  

Reply via email to