natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'apache-3.1' into apache-3.2 

# Conflicts:
#	dubbo-dependencies-bom/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
#	dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
#	pom.xml
This commit is contained in:
Albumen Kevin 2023-03-17 10:07:46 +08:00
parent 48f3169809 7d9e955cf8
commit f742e25ba2
8 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
View File

@ -50,6 +50,11 @@ public interface Invoker<T> extends org.apache.dubbo.rpc.Invoker<T> {
return invoker.getInterface();
}
@Override
public org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invocation invocation) throws org.apache.dubbo.rpc.RpcException {
return new Result.CompatibleResult(invoker.invoke(invocation));
}
@Override
public Result invoke(Invocation invocation) throws RpcException {
return new Result.CompatibleResult(invoker.invoke(invocation.getOriginal()));

5
dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
View File

@ -103,6 +103,11 @@ public interface Result extends org.apache.dubbo.rpc.Result {
return delegate;
}
@Override
public org.apache.dubbo.rpc.Result whenCompleteWithContext(BiConsumer<org.apache.dubbo.rpc.Result, Throwable> fn) {
return delegate.whenCompleteWithContext(fn);
}
@Override
public Object getValue() {
return delegate.getValue();

2
dubbo-dependencies-bom/pom.xml
View File

@ -190,7 +190,7 @@
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.1.0</maven_flatten_version>
<commons_compress_version>1.22</commons_compress_version>
<revision>3.2.0-beta.6</revision>
<revision>3.2.0-beta.7-SNAPSHOT</revision>
</properties>
<dependencyManagement>

2
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
<revision>3.2.0-beta.6</revision>
<revision>3.2.0-beta.7-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.7.0</zookeeper_version>

2
dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
<revision>3.2.0-beta.6</revision>
<revision>3.2.0-beta.7-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
<curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>

3
dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
View File

@ -31,6 +31,7 @@ import org.apache.dubbo.rpc.FutureContext;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.RpcInvocation;
import org.apache.dubbo.rpc.protocol.AbstractInvoker;
@ -103,6 +104,8 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
invocation.setAttachment(TIMEOUT_KEY, String.valueOf(timeout));
RpcContext.getServiceContext().setRemoteAddress(currentClient.getRemoteAddress());
Integer payload = getUrl().getParameter(PAYLOAD, Integer.class);
Request request = new Request();

6
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/call/TripleClientCall.java
View File

@ -80,8 +80,10 @@ public class TripleClientCall implements ClientCall, ClientStream.Listener {
final Object unpacked = requestMetadata.packableMethod.parseResponse(message);
listener.onMessage(unpacked);
} catch (Throwable t) {
cancelByLocal(TriRpcStatus.INTERNAL.withDescription("Deserialize response failed")
.withCause(t).asException());
TriRpcStatus status = TriRpcStatus.INTERNAL.withDescription("Deserialize response failed")
.withCause(t);
cancelByLocal(status.asException());
listener.onClose(status,null);
LOGGER.error(PROTOCOL_FAILED_RESPONSE, "", "", String.format("Failed to deserialize triple response, service=%s, method=%s,connection=%s",
connectionClient, requestMetadata.service, requestMetadata.method.getMethodName()), t);
}

2
pom.xml
View File

@ -130,7 +130,7 @@
<checkstyle_unix.skip>true</checkstyle_unix.skip>
<rat.skip>true</rat.skip>
<jacoco.skip>true</jacoco.skip>
<revision>3.2.0-beta.6</revision>
<revision>3.2.0-beta.7-SNAPSHOT</revision>
</properties>
<modules>