This is an automated email from the ASF dual-hosted git repository.
xiaoheng 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 cca6871 issue no #8589, should be use Camel-Case rule (#8590)
cca6871 is described below
commit cca6871bdfd0e61462586dd5ed3d7653655dee6d
Author: Bazooka <[email protected]>
AuthorDate: Tue Aug 24 23:01:10 2021 +0800
issue no #8589, should be use Camel-Case rule (#8590)
---
.../dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java | 6 +++---
.../dubbo/rpc/protocol/dubbo/DubboCodecSupport.java | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
index 8c2f671..05b84cb 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
@@ -120,9 +120,9 @@ public class DecodeableRpcResult extends AppResponse
implements Codec, Decodeabl
try {
if (invocation != null) {
if
(ConfigurationUtils.getSystemConfiguration().getBoolean(SERIALIZATION_SECURITY_CHECK_KEY,
true)) {
- Object serializationType_obj =
invocation.get(SERIALIZATION_ID_KEY);
- if (serializationType_obj != null) {
- if ((byte) serializationType_obj !=
serializationType) {
+ Object serializationTypeObj =
invocation.get(SERIALIZATION_ID_KEY);
+ if (serializationTypeObj != null) {
+ if ((byte) serializationTypeObj !=
serializationType) {
throw new IOException("Unexpected
serialization id:" + serializationType + " received from network, please check
if the peer send the right id.");
}
}
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodecSupport.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodecSupport.java
index 2dbb312..500888f 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodecSupport.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodecSupport.java
@@ -30,21 +30,21 @@ import static
org.apache.dubbo.rpc.Constants.SERIALIZATION_ID_KEY;
public class DubboCodecSupport {
public static Serialization getRequestSerialization(URL url, Invocation
invocation) {
- Object serializationType_obj = invocation.get(SERIALIZATION_ID_KEY);
- if (serializationType_obj != null) {
- return CodecSupport.getSerializationById((byte)
serializationType_obj);
+ Object serializationTypeObj = invocation.get(SERIALIZATION_ID_KEY);
+ if (serializationTypeObj != null) {
+ return CodecSupport.getSerializationById((byte)
serializationTypeObj);
}
return
ExtensionLoader.getExtensionLoader(Serialization.class).getExtension(
url.getParameter(org.apache.dubbo.remoting.Constants.SERIALIZATION_KEY,
Constants.DEFAULT_REMOTING_SERIALIZATION));
}
public static Serialization getResponseSerialization(URL url, AppResponse
appResponse) {
- Object invocation_obj = appResponse.getAttribute(INVOCATION_KEY);
- if (invocation_obj != null) {
- Invocation invocation = (Invocation) invocation_obj;
- Object serializationType_obj =
invocation.get(SERIALIZATION_ID_KEY);
- if (serializationType_obj != null) {
- return CodecSupport.getSerializationById((byte)
serializationType_obj);
+ Object invocationObj = appResponse.getAttribute(INVOCATION_KEY);
+ if (invocationObj != null) {
+ Invocation invocation = (Invocation) invocationObj;
+ Object serializationTypeObj = invocation.get(SERIALIZATION_ID_KEY);
+ if (serializationTypeObj != null) {
+ return CodecSupport.getSerializationById((byte)
serializationTypeObj);
}
}
return
ExtensionLoader.getExtensionLoader(Serialization.class).getExtension(