HTRACE-79 addendum. Fix broken build from "Unicode (UTF-8) BOM in middle of file" error from bundler.go
diff --git a/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go b/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
index 982dc8f..11c3292 100644
--- a/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
+++ b/htrace-core/src/go/src/org/apache/htrace/bundler/bundler.go
@@ -160,7 +160,10 @@
reader := bufio.NewReader(in)
scanner := bufio.NewScanner(reader)
for scanner.Scan() {
- _, err := out.WriteString(strings.Replace(scanner.Text(), "`", "` + \"`\" + `", -1) + "\n")
+ str := strings.Replace(scanner.Text(), "`", "` + \"`\" + `", -1) + "\n"
+ // Avoid "Unicode (UTF-8) BOM in middle of file" error.
+ str = strings.Replace(str, "\uFEFF", "` + \"\\uFEFF\" + `", -1)
+ _, err := out.WriteString(str)
if err != nil {
return err
}
@@ -223,6 +226,6 @@
log.Fatalf("Error creating bundle file for %s in %s: %s\n",
sfiles[s], *dst, err.Error())
}
- log.Printf("Bundled %s as %s\n", absSrc, absSrc+SEP+sfileToDfile(sfiles[s]))
+ log.Printf("Bundled %s as %s\n", absSrc, *dst+SEP+sfileToDfile(sfiles[s]))
}
}
