HTRACE-201: htrace-web: URL-Encode query JSON (cmccabe)
diff --git a/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go b/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go
index ae3ba3f..ee62642 100644
--- a/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go
+++ b/htrace-htraced/go/src/org/apache/htrace/htraced/rest.go
@@ -207,7 +207,7 @@
err := dec.Decode(&query)
if err != nil {
writeError(hand.lg, w, http.StatusBadRequest,
- fmt.Sprintf("Error parsing query: %s", err.Error()))
+ fmt.Sprintf("Error parsing query '%s': %s", queryString, err.Error()))
return
}
var results []*common.Span
diff --git a/htrace-webapp/src/main/web/app/query_results.js b/htrace-webapp/src/main/web/app/query_results.js
index dc37e1e..8beaf0e 100644
--- a/htrace-webapp/src/main/web/app/query_results.js
+++ b/htrace-webapp/src/main/web/app/query_results.js
@@ -40,6 +40,6 @@
},
queryString: function() {
- return JSON.stringify(this.queryJson);
+ return encodeURIComponent(JSON.stringify(this.queryJson));
}
});
