summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2006-12-19 23:46:22 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2006-12-19 23:46:22 +0000
commita94e8ecc8d722d0f37e598d1ea86c2a3719ca331 (patch)
treed24c31042fa3cdab18df4aba47d83145b13e4884
parent869d5aca2f959caa83ae045b5df9897787933cd0 (diff)
downloadcpptasks-parallel-a94e8ecc8d722d0f37e598d1ea86c2a3719ca331.tar.gz
cpptasks-parallel-a94e8ecc8d722d0f37e598d1ea86c2a3719ca331.tar.bz2
cpptasks-parallel-a94e8ecc8d722d0f37e598d1ea86c2a3719ca331.tar.xz
cpptasks-parallel-a94e8ecc8d722d0f37e598d1ea86c2a3719ca331.zip
Patch 1.3
-rw-r--r--PATCHES3
-rw-r--r--src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java2
2 files changed, 4 insertions, 1 deletions
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;