JAL-3743 JAL-3745 Fixed NullPointerExceptions happening with linkCheck and jalviewjsT...
authorBen Soares <b.soares@dundee.ac.uk>
Mon, 26 Apr 2021 16:56:19 +0000 (17:56 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 15 Jul 2021 10:23:11 +0000 (11:23 +0100)
build.gradle

index 180d4ad..fc37a00 100644 (file)
@@ -1299,13 +1299,12 @@ task linkCheck(type: JavaExec) {
   args = [ "${classesDir}/${help_dir}", "-nointernet" ]
 
   def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append
-  def errFOS = outFOS
   standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
     outFOS,
-    standardOutput)
+    System.out)
   errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
     outFOS,
-    errorOutput)
+    System.err)
 
   inputs.dir("${classesDir}/${help_dir}")
   outputs.file(helpLinksCheckerOutFile)
@@ -2418,12 +2417,12 @@ DEBUG: ${eclipseDebug}
         new org.apache.tools.ant.util.TeeOutputStream(
           logOutFOS,
           stdout),
-        standardOutput)
+        System.out)
       errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
         new org.apache.tools.ant.util.TeeOutputStream(
           logErrFOS,
           stderr),
-        errorOutput)
+        System.err)
     } else {
       standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
         logOutFOS,