Author: richard.opalka(a)jboss.com Date: 2009-02-25 00:11:17 -0500 (Wed, 25 Feb 2009) New Revision: 9391 Added: common/trunk/src/main/java/org/jboss/wsf/common/concurrent/ common/trunk/src/main/java/org/jboss/wsf/common/concurrent/CopyJob.java Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java Log: [JBWS-2551] fixing Windows issue Added: common/trunk/src/main/java/org/jboss/wsf/common/concurrent/CopyJob.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/concurrent/CopyJob.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/concurrent/CopyJob.java 2009-02-25 05:11:17 UTC (rev 9391) @@ -0,0 +1,142 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.common.concurrent; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * Sample usage: + * + * <blockquote><pre> + * CopyJob copyJob = new CopyJob( inputStream, printStream ); + * new Thread( copyJob ).start(); + * try + * { + * // do some other staff + * ... + * } + * finally + * { + * copyJob.kill(); + * } + * </pre></blockquote> + * + * @author richard.opalka(a)jboss.com + */ +public final class CopyJob implements Runnable +{ + + /** + * Input stream to data read from. + */ + private final InputStream is; + /** + * Output stream to write data to. + */ + private final OutputStream os; + /** + * Whether this job is terminated. + */ + private boolean terminated; + + /** + * Constructor. + * @param is input stream to read data from + * @param os output stream to write data to + */ + public CopyJob( InputStream is, OutputStream os ) + { + super(); + + if ( ( is == null ) || ( os == null ) ) + { + throw new IllegalArgumentException( "Constructor parameters can't be null" ); + } + + this.is = is; + this.os = os; + } + + /** + * Copies all data from <b>input stream</b> to <b>output stream</b> (both passed to constructor) until job is killed + */ + public final void run() + { + try + { + copy( this.is, this.os ); + } + catch ( IOException ioe ) + { + ioe.printStackTrace(System.err); + } + finally + { + try { this.is.close(); } catch ( IOException ioe ) { ioe.printStackTrace( System.err ); } + } + } + + /** + * Copies all data from <b>is</b> to <b>os</b> until job is killed + * @param is input stream to read data from + * @param os output stream to write data to + * @throws IOException if I/O error occurs + */ + private void copy( final InputStream is, final OutputStream os ) throws IOException + { + final byte[] buffer = new byte[ 512 ]; + int countOfBytes = -1; + + while ( !this.terminated ) + { + while ( is.available() <= 0 ) + { + synchronized( this ) + { + try + { + this.wait( 50 ); // guard + if ( this.terminated ) return; + } + catch ( InterruptedException ie ) + { + ie.printStackTrace( System.err ); + } + } + } + + countOfBytes = is.read( buffer, 0, buffer.length ); + os.write( buffer, 0, countOfBytes ); + } + } + + /** + * Kills this job. Calling this method also ensures that input stream passed to the constructor will be closed properly + */ + public final void kill() + { + this.terminated = true; + } + +} \ No newline at end of file Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-02-24 23:45:09 UTC (rev 9390) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-02-25 05:11:17 UTC (rev 9391) @@ -41,6 +41,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.DOMWriter; import org.jboss.wsf.common.IOUtils; +import org.jboss.wsf.common.concurrent.CopyJob; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -111,16 +112,16 @@ System.out.println("Executing command: " + command); Process p = Runtime.getRuntime().exec(command); + CopyJob inputStreamJob = new CopyJob(p.getInputStream(), os == null ? System.out : os); + CopyJob errorStreamJob = new CopyJob(p.getErrorStream(), System.err); + // unfortunately the following threads are needed because of Windows behavior System.out.println("Process input stream:"); - IOUtils.copyStream(os == null ? System.out : os, p.getInputStream()); + System.err.println("Process error stream:"); + new Thread( inputStreamJob ).start(); + new Thread( errorStreamJob ).start(); try { int statusCode = p.waitFor(); - if (statusCode != 0) - { - System.err.println("Process error stream:"); - IOUtils.copyStream(System.err, p.getErrorStream()); - } String fallbackMessage = "Process did exit with status " + statusCode; assertTrue(message != null ? message : fallbackMessage, statusCode == 0); } @@ -130,6 +131,8 @@ } finally { + inputStreamJob.kill(); + errorStreamJob.kill(); p.destroy(); } }