From a94e8ecc8d722d0f37e598d1ea86c2a3719ca331 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Tue, 19 Dec 2006 23:46:22 +0000
Subject: Patch 1.3

---
 PATCHES                                                           | 3 +++
 src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/PATCHES b/PATCHES
index b472427..d77a508 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,4 +1,7 @@
 *** Changes marked with FREEHEP.
+cpptasks-20051015-patched-1.3
+- protected return of net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler.run().
+
 cpptasks-20051015-patched-1.2
 - added -shared-libgcc/-static-libgcc for linking gcc and c++. 
 - added -dynamic as a valid option to GccLinker
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java b/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
index 61fa36d..1412eee 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
@@ -51,7 +51,7 @@ public class CaptureStreamHandler implements ExecuteStreamHandler {
 			int status = exec.execute();
 		} catch (IOException ex) {
 		}
-		return handler.getOutput();
+		return handler.getOutput() != null ? handler.getOutput() : new String[0];
 	}
 
 	private InputStream processErrorStream;
-- 
cgit v1.2.3