Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2018-01-18 17:05:22 +01:00

View File

@@ -75,13 +75,13 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
}
private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {
StringBuilder message = new StringBuilder("\n\nFound multiple occurrences of"
+ " org.json.JSONObject on the class path:\n\n");
StringBuilder message = new StringBuilder(String.format("%n%nFound multiple occurrences of"
+ " org.json.JSONObject on the class path:%n%n"));
for (URL jsonObject : jsonObjects) {
message.append("\t" + jsonObject + "\n");
message.append(String.format("\t%s%n", jsonObject));
}
message.append("\nYou may wish to exclude one of them to ensure"
+ " predictable runtime behavior\n");
message.append(String.format("%nYou may wish to exclude one of them to ensure"
+ " predictable runtime behavior%n"));
this.logger.warn(message);
}