summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;