Skip to content

fix: toCommaDelimitedString returns "null,null" when inputs are null #15338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlbumenJ merged 2 commits into from
May 8, 2025
Merged

fix: toCommaDelimitedString returns "null,null" when inputs are null #15338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df5f6d4
fix: return 'one' if others is null in toCommaDelimitedString
ankitshokeen May 7, 2025
4dc4e28
fix:
ankitshokeen May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,14 +1242,20 @@ public static byte decodeHexByte(CharSequence s, int pos) {
}

/**
* Create the common-delimited {@link String} by one or more {@link String} members
* Creates a comma-delimited string from one or more string values.
*
* @param one one {@link String}
* @param others others {@link String}
* @return <code>null</code> if <code>one</code> or <code>others</code> is <code>null</code>
* @param one the first string value
* @param others additional string values
* @return the combined string, or null if the first value is null
* @since 2.7.8
*/
public static String toCommaDelimitedString(String one, String... others) {
if (one == null) {
return null;
Copy link
Member

@AlbumenJ AlbumenJ May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if one != null && others == null

should return one?

Copy link
Contributor Author

@ankitshokeen ankitshokeen May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it should return one

}
if (others == null) {
return one;
}
String another = arrayToDelimitedString(others, COMMA_SEPARATOR);
return isEmpty(another) ? one : one + COMMA_SEPARATOR + another;
}
Expand Down
4 changes: 4 additions & 0 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/StringUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ private void assertEqualsWithoutSpaces(String expect, String actual) {

/**
* Test {@link StringUtils#toCommaDelimitedString(String, String...)}
*
* @since 2.7.8
*/
@Test
Expand All @@ -484,6 +485,9 @@ void testToCommaDelimitedString() {
value = toCommaDelimitedString(null, null);
assertNull(value);

value = toCommaDelimitedString("one", null);
assertEquals("one", value);

value = toCommaDelimitedString("");
assertEquals("", value);

Expand Down