You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2020/07/08 22:08:41 UTC

[activemq-artemis] branch master updated: Revert "ARTEMIS-2801 Fix ByteUtil.getHumanReadableByteCount() giving inconsistent results"

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new fbeb9a4  Revert "ARTEMIS-2801 Fix ByteUtil.getHumanReadableByteCount() giving inconsistent results"
fbeb9a4 is described below

commit fbeb9a492c752e35b9db3b081648ebcf9ab70c20
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Wed Jul 8 18:08:23 2020 -0400

    Revert "ARTEMIS-2801 Fix ByteUtil.getHumanReadableByteCount() giving inconsistent results"
    
    I merged this one by accident
    
    This reverts commit ffb117d15920fedc7e4246dc4c5881bd1ab47eb9.
---
 .../src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index 21f8093..84264d3 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -21,7 +21,6 @@ import java.io.StringWriter;
 import java.nio.ByteBuffer;
 import java.nio.ReadOnlyBufferException;
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -450,7 +449,6 @@ public class ByteUtil {
          i++;
       }
 
-      // Set locale to language/country neutral to avoid different behavior for non-US users
-      return String.format(Locale.ROOT, "%.1f%sB", bytes / BYTE_MAGNITUDES[i], BYTE_SUFFIXES[i]);
+      return String.format("%.1f%sB", bytes / BYTE_MAGNITUDES[i], BYTE_SUFFIXES[i]);
    }
 }