Merge
authormduigou
Fri, 31 May 2013 17:31:40 -0700
changeset 17928 717ffe79604d
parent 17926 1a74b1b8cad1 (current diff)
parent 17927 dc3d1b30cb78 (diff)
child 17929 5ef41523c723
Merge
--- a/jdk/src/share/classes/java/util/IntSummaryStatistics.java	Fri May 31 15:18:15 2013 -0400
+++ b/jdk/src/share/classes/java/util/IntSummaryStatistics.java	Fri May 31 17:31:40 2013 -0700
@@ -159,7 +159,7 @@
      */
     public String toString() {
         return String.format(
-            "%s{count=%d, sum=%d, min=%d, average=%d, max=%d}",
+            "%s{count=%d, sum=%d, min=%d, average=%f, max=%d}",
             this.getClass().getSimpleName(),
             getCount(),
             getSum(),
--- a/jdk/src/share/classes/java/util/LongSummaryStatistics.java	Fri May 31 15:18:15 2013 -0400
+++ b/jdk/src/share/classes/java/util/LongSummaryStatistics.java	Fri May 31 17:31:40 2013 -0700
@@ -171,7 +171,7 @@
      */
     public String toString() {
         return String.format(
-            "%s{count=%d, sum=%d, min=%d, average=%d, max=%d}",
+            "%s{count=%d, sum=%d, min=%d, average=%f, max=%d}",
             this.getClass().getSimpleName(),
             getCount(),
             getSum(),