addressed issue #44. format corrected replying multiple Link headers

ScorpioBroker · Dec 6, 2019 · 124cd01 · 124cd01
1 parent a813f36
commit 124cd01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Commons/src/main/java/eu/neclab/ngsildbroker/commons/tools/HttpUtils.java b/Commons/src/main/java/eu/neclab/ngsildbroker/commons/tools/HttpUtils.java
@@ -788,7 +788,10 @@ public ResponseEntity<Object> generateReply(String replyBody, HashMap<String, Li
 		BodyBuilder builder = ResponseEntity.status(status);
 		if (additionalHeaders != null) {
 			for (Entry<String, List<String>> entry : additionalHeaders.entrySet()) {
-				builder.header(entry.getKey(), entry.getValue().toArray(new String[0]));
+				for(String value: entry.getValue()) {
+					builder.header(entry.getKey(), value);
+				}
+
 			}
 		}
 		return builder.body(replyBody);

diff --git a/...Manager/src/main/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryController.java b/...Manager/src/main/java/eu/neclab/ngsildbroker/queryhandler/controller/QueryController.java
@@ -263,7 +263,7 @@ private String generateFollowUpLinkHeader(HttpServletRequest request, int offset
 		}
 		builder.append("offset=" + offset + "&");
 		builder.append("limit=" + limit + "&");
-		builder.append("qtoken=" + token + ">rel=\"" + rel + "\"");
+		builder.append("qtoken=" + token + ">;rel=\"" + rel + "\"");
 		return builder.toString();
 	}