From 2ae0502e8074a4e5720024e1e0fcc3a540c14d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=88=E9=93=AD?= Date: Wed, 21 Aug 2024 14:07:32 +0800 Subject: [PATCH 1/4] fix organization url, the http://www.antfin.com is currently unavailable --- all/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 502f6dfcf..b721c882d 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -23,7 +23,7 @@ The Ant Financial - http://www.antfin.com/ + https://www.sofastack.tech/ diff --git a/pom.xml b/pom.xml index 4b9bfb52d..7fe5f6185 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ sofa-rpc-parent ${revision} pom - [SOFA] - RPC Framework - http://www.antfin.com + [SOFA] RPC Framework + https://www.sofastack.tech/ [SOFA] RPC Framework of Java. The Ant Financial - http://www.antfin.com/ + https://www.sofastack.tech/ From 1fafe156f5bf82a84a2e60cebeb1a77a2c093e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=88=E9=93=AD?= Date: Wed, 21 Aug 2024 14:30:18 +0800 Subject: [PATCH 2/4] Revert "fix organization url, the http://www.antfin.com is currently unavailable" This reverts commit 2ae0502e8074a4e5720024e1e0fcc3a540c14d54. --- all/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index b721c882d..502f6dfcf 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -23,7 +23,7 @@ The Ant Financial - https://www.sofastack.tech/ + http://www.antfin.com/ diff --git a/pom.xml b/pom.xml index 7fe5f6185..4b9bfb52d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ sofa-rpc-parent ${revision} pom - [SOFA] RPC Framework - https://www.sofastack.tech/ + [SOFA] - RPC Framework + http://www.antfin.com [SOFA] RPC Framework of Java. The Ant Financial - https://www.sofastack.tech/ + http://www.antfin.com/ From 87dc8ede2388a94239a0e46c4a4662457513fdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=88=E9=93=AD?= Date: Wed, 21 Aug 2024 15:34:21 +0800 Subject: [PATCH 3/4] enhance setErrorMsg, use StringUtils.isBlank --- .../java/com/alipay/sofa/rpc/core/response/SofaResponse.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/core/response/SofaResponse.java b/core/api/src/main/java/com/alipay/sofa/rpc/core/response/SofaResponse.java index 9dbdd3a86..f757c7957 100644 --- a/core/api/src/main/java/com/alipay/sofa/rpc/core/response/SofaResponse.java +++ b/core/api/src/main/java/com/alipay/sofa/rpc/core/response/SofaResponse.java @@ -16,6 +16,7 @@ */ package com.alipay.sofa.rpc.core.response; +import com.alipay.sofa.rpc.common.utils.StringUtils; import com.alipay.sofa.rpc.transport.AbstractByteBuf; import java.io.Serializable; @@ -105,7 +106,7 @@ public String getErrorMsg() { * @param error the error */ public void setErrorMsg(String error) { - if (error == null) { + if (StringUtils.isBlank(error)) { return; } errorMsg = error; From 7ec1cd070938dfd2a86da5c0492025b740de7546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=88=E9=93=AD?= Date: Thu, 22 Aug 2024 10:26:38 +0800 Subject: [PATCH 4/4] enhance setErrorMsg, use StringUtils.isBlank --- .../alipay/sofa/rpc/codec/jackson/JacksonSerializerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/codec-jackson/src/test/java/com/alipay/sofa/rpc/codec/jackson/JacksonSerializerTest.java b/codec/codec-jackson/src/test/java/com/alipay/sofa/rpc/codec/jackson/JacksonSerializerTest.java index be218792a..e776ee1d0 100644 --- a/codec/codec-jackson/src/test/java/com/alipay/sofa/rpc/codec/jackson/JacksonSerializerTest.java +++ b/codec/codec-jackson/src/test/java/com/alipay/sofa/rpc/codec/jackson/JacksonSerializerTest.java @@ -650,6 +650,6 @@ public void testDecodeSofaResponse() { ctx.put(RemotingConstants.HEAD_RESPONSE_ERROR, "true"); jacksonSerializer.decode(nullByteBuf, sofaResponse, ctx); Assert.assertTrue(sofaResponse.isError()); - Assert.assertEquals("", sofaResponse.getErrorMsg()); + Assert.assertNull(sofaResponse.getErrorMsg()); } } \ No newline at end of file