You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/12 02:15:00 UTC
[dubbo] branch 3.0 updated: Throw the IllegalArgumentException if
the address is empty to avoid NPE. (#8208)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 11fe5de Throw the IllegalArgumentException if the address is empty to avoid NPE. (#8208)
11fe5de is described below
commit 11fe5de97c9c7357e1e8c5c90155c7565fc2a6d0
Author: blake.qiu <46...@users.noreply.github.com>
AuthorDate: Mon Jul 12 10:14:45 2021 +0800
Throw the IllegalArgumentException if the address is empty to avoid NPE. (#8208)
* Throw the IllegalArgumentException if the address is empty to avoid NPE.
* Fix the unit test of parseURL and parseURLS
* Fixed the line indentation caused by the last commit
Co-authored-by: blake.qiu <bl...@ly.com>
---
.../main/java/org/apache/dubbo/common/utils/UrlUtils.java | 6 +++---
.../java/org/apache/dubbo/common/utils/UrlUtilsTest.java | 14 ++++++++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java
index e437d99..1a745e7 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java
@@ -69,7 +69,7 @@ public class UrlUtils {
public static URL parseURL(String address, Map<String, String> defaults) {
if (address == null || address.length() == 0) {
- return null;
+ throw new IllegalArgumentException("Address is not allowed to be empty, please re-enter.");
}
String url;
if (address.contains("://") || address.contains(URL_PARAM_STARTING_SYMBOL)) {
@@ -166,11 +166,11 @@ public class UrlUtils {
public static List<URL> parseURLs(String address, Map<String, String> defaults) {
if (address == null || address.length() == 0) {
- return null;
+ throw new IllegalArgumentException("Address is not allowed to be empty, please re-enter.");
}
String[] addresses = REGISTRY_SPLIT_PATTERN.split(address);
if (addresses == null || addresses.length == 0) {
- return null; //here won't be empty
+ throw new IllegalArgumentException("Addresses is not allowed to be empty, please re-enter."); //here won't be empty
}
List<URL> registries = new ArrayList<URL>();
for (String addr : addresses) {
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
index c843a7a..948bce4 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java
@@ -43,7 +43,12 @@ public class UrlUtilsTest {
@Test
public void testAddressNull() {
- assertNull(UrlUtils.parseURL(null, null));
+ String exceptionMessage = "Address is not allowed to be empty, please re-enter.";
+ try {
+ UrlUtils.parseURL(null, null);
+ } catch (IllegalArgumentException illegalArgumentException) {
+ assertEquals(exceptionMessage, illegalArgumentException.getMessage());
+ }
}
@Test
@@ -133,7 +138,12 @@ public class UrlUtilsTest {
@Test
public void testParseUrlsAddressNull() {
- assertNull(UrlUtils.parseURLs(null, null));
+ String exceptionMessage = "Address is not allowed to be empty, please re-enter.";
+ try {
+ UrlUtils.parseURLs(null, null);
+ } catch (IllegalArgumentException illegalArgumentException) {
+ assertEquals(exceptionMessage, illegalArgumentException.getMessage());
+ }
}
@Test