Commit efd941bb authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.5.x'

parents 6086bc71 97a51ddc
...@@ -75,13 +75,13 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa ...@@ -75,13 +75,13 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
} }
private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) { private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {
StringBuilder message = new StringBuilder("\n\nFound multiple occurrences of" StringBuilder message = new StringBuilder(String.format("%n%nFound multiple occurrences of"
+ " org.json.JSONObject on the class path:\n\n"); + " org.json.JSONObject on the class path:%n%n"));
for (URL jsonObject : jsonObjects) { 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" message.append(String.format("%nYou may wish to exclude one of them to ensure"
+ " predictable runtime behavior\n"); + " predictable runtime behavior%n"));
this.logger.warn(message); this.logger.warn(message);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment