# HG changeset patch
# User mlarsson
# Date 1461897848 -7200
# Node ID 1ad0239b6e4a21f352e751526e5df9d8f1682fe0
# Parent  04da6a12ab0dcebf2982f311992dddaf3381abf6# Parent  c576864b47767d4d8813ef00205e4b098aeebcfb
Merge

diff -r 04da6a12ab0d -r 1ad0239b6e4a hotspot/src/share/vm/logging/logConfiguration.cpp
--- a/hotspot/src/share/vm/logging/logConfiguration.cpp	Fri Apr 29 03:02:43 2016 +0200
+++ b/hotspot/src/share/vm/logging/logConfiguration.cpp	Fri Apr 29 04:44:08 2016 +0200
@@ -408,10 +408,12 @@
   out->print_cr("Log output configuration:");
   for (size_t i = 0; i < _n_outputs; i++) {
     out->print("#" SIZE_FORMAT ": %s %s ", i, _outputs[i]->name(), _outputs[i]->config_string());
+    char delimiter[2] = {0};
     for (size_t d = 0; d < LogDecorators::Count; d++) {
       LogDecorators::Decorator decorator = static_cast<LogDecorators::Decorator>(d);
       if (_outputs[i]->decorators().is_decorator(decorator)) {
-        out->print("%s,", LogDecorators::name(decorator));
+        out->print("%s%s", delimiter, LogDecorators::name(decorator));
+        *delimiter = ',';
       }
     }
     out->cr();