[Generator-rt-devel] generator_runtime/src/java/generator/runtime/fileupload/transform LoggingStreamConsumer.java, 1.2, 1.3

[Rick K. <ric...@us...>]

Update of /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/fileupload/transform
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20904/src/java/generator/runtime/fileupload/transform

Modified Files:
	LoggingStreamConsumer.java 
Log Message:
fix the logging of system process output to line wrap properly

Index: LoggingStreamConsumer.java
===================================================================
RCS file: /cvsroot/generator-rt/generator_runtime/src/java/generator/runtime/fileupload/transform/LoggingStreamConsumer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LoggingStreamConsumer.java	19 Apr 2010 06:34:45 -0000	1.2
--- LoggingStreamConsumer.java	23 Apr 2010 01:32:31 -0000	1.3
***************
*** 21,26 ****
--- 21,28 ----
  import generator.runtime.log.LogManager;
  
+ import java.io.BufferedReader;
  import java.io.IOException;
  import java.io.InputStream;
+ import java.io.InputStreamReader;
  
  /**
***************
*** 44,61 ****
      
      public void run() {
!         byte buffer[] = new byte[4096];
!         int read = 0;
!         try {
!             while ((read = in.read(buffer)) != -1) {
!                 log.debug(new String(buffer, 0, read, encoding));
              }
!         } catch (IOException err) {
              log.error("Error in stream consumer (" + id + ")", err);
!         }
!         log.fullDebug("Stream consumer finished (" + id + ")");
!         try {
!             in.close();
!         } catch (IOException err) {
!             log.error("Error closing stream (" + id + ")", err);
          }
      }
--- 46,73 ----
      
      public void run() {
!     	BufferedReader lineReader = null;
!     	String line = null;
!     	try {
!     		lineReader = new BufferedReader(new InputStreamReader(this.in, this.encoding));
!             while ((line = lineReader.readLine()) != null) {
!                 log.debug(line);
              }
!         } catch (Throwable err) {
              log.error("Error in stream consumer (" + id + ")", err);
!         } finally {
!         	if (lineReader != null) {
!                 try {
!                 	lineReader.close();
!                 } catch (IOException err) {
!                     log.error("Error closing stream (" + id + ")", err);
!                 }
!                 lineReader = null;
!         	}
!             try {
!                 in.close();
!             } catch (IOException err) {
!                 log.error("Error closing stream (" + id + ")", err);
!             }
!             log.fullDebug("Stream consumer finished (" + id + ")");
          }
      }