[pulsar] branch branch-2.9 updated: cherry-pick -x "3c3ec49"

[bogong]

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

bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new 24f951049f4 cherry-pick -x "3c3ec49"
24f951049f4 is described below

commit 24f951049f4f2fbd280b4e5b287271134166c20c
Author: Cong Zhao <zhaoc...@apache.org>
AuthorDate: Thu Aug 18 16:08:05 2022 +0800

    cherry-pick -x "3c3ec49"
---
 .../apache/pulsar/testclient/DefaultMessageFormatter.java    | 12 +++++-------
 .../pulsar/testclient/TestDefaultMessageFormatter.java       |  8 +++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git 
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
 
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
index bf183a6d24b..dabfe1cf103 100644
--- 
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
+++ 
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/DefaultMessageFormatter.java
@@ -101,14 +101,12 @@ public class DefaultMessageFormatter implements 
IMessageFormatter {
     }
 
     private String getIntValue(float size) {
-        int i = 0;
-        if (size != 0) {
-            i = (int) _getFloatValue(size);
-        }
-        if (i == 0) {
-            i = r.nextInt() + 1;
+
+        if (size == 0) {
+            return String.valueOf(r.nextInt());
         }
-        return String.valueOf(i);
+
+        return String.valueOf((int) _getFloatValue(size));
     }
     private String getLongValue(float size) {
         if (size == 0) {
diff --git 
a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
 
b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
index 9be6cccd1da..d7a26db6bb7 100644
--- 
a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
+++ 
b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/TestDefaultMessageFormatter.java
@@ -18,14 +18,12 @@
  */
 package org.apache.pulsar.testclient;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.nio.charset.StandardCharsets;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.nio.charset.StandardCharsets;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 public class TestDefaultMessageFormatter {
 
     @Test
@@ -66,7 +64,7 @@ public class TestDefaultMessageFormatter {
         Assert.assertTrue(l3 > 0);
         Assert.assertTrue(l3 <= 99999);
         Assert.assertTrue(i2 < 10);
-        Assert.assertTrue(0 < i2, "i2 was " + i2);
+        Assert.assertTrue(0 <= i2, "i2 was " + i2);
         Assert.assertTrue(f2 < 100000);
         Assert.assertTrue( -100000 < f2);