提交 7dd34d58 编写于 作者: oldratlee's avatar oldratlee 🔥

DUBBO-625 业务对象的toString方法异常会导致RemotingInvocationTimeoutScan失效

上级 2d73e4f0
/*
* Copyright 1999-2011 Alibaba Group.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright 1999-2011 Alibaba Group.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.dubbo.remoting.exchange;
import java.util.concurrent.atomic.AtomicLong;
import com.alibaba.dubbo.common.utils.StringUtils;
/**
* Request.
*
* @author qian.lei
* @author william.liangf
*/
public class Request {
public static final String HEARTBEAT_EVENT = null;
public static final String READONLY_EVENT = "R";
public class Request {
public static final String HEARTBEAT_EVENT = null;
public static final String READONLY_EVENT = "R";
private static final AtomicLong INVOKE_ID = new AtomicLong(0);
private final long mId;
private String mVersion;
private boolean mTwoWay = true;
private boolean mTwoWay = true;
private boolean mEvent = false;
private boolean mBroken = false;
......@@ -70,15 +72,15 @@ public class Request {
public void setTwoWay(boolean twoWay) {
mTwoWay = twoWay;
}
public boolean isEvent() {
return mEvent;
}
public void setEvent(String event) {
mEvent = true;
mData = event;
}
public boolean isEvent() {
return mEvent;
}
public void setEvent(String event) {
mEvent = true;
mData = event;
}
public boolean isBroken() {
return mBroken;
......@@ -95,16 +97,16 @@ public class Request {
public void setData(Object msg) {
mData = msg;
}
public boolean isHeartbeat() {
return mEvent && HEARTBEAT_EVENT == mData;
}
public void setHeartbeat(boolean isHeartbeat) {
if (isHeartbeat) {
setEvent(HEARTBEAT_EVENT);
}
}
public boolean isHeartbeat() {
return mEvent && HEARTBEAT_EVENT == mData;
}
public void setHeartbeat(boolean isHeartbeat) {
if (isHeartbeat) {
setEvent(HEARTBEAT_EVENT);
}
}
private static long newId() {
// getAndIncrement()增长到MAX_VALUE时,再增长会变为MIN_VALUE,负数也可以做为ID
......@@ -114,7 +116,18 @@ public class Request {
@Override
public String toString() {
return "Request [id=" + mId + ", version=" + mVersion + ", twoway=" + mTwoWay + ", event=" + mEvent
+ ", broken=" + mBroken + ", data=" + (mData == this ? "this" : mData) + "]";
+ ", broken=" + mBroken + ", data=" + (mData == this ? "this" : safeToString(mData)) + "]";
}
}
\ No newline at end of file
private static String safeToString(Object data) {
if (data == null) return null;
String dataStr;
try {
dataStr = data.toString();
} catch (Throwable e) {
dataStr = "<Fail toString of " + data.getClass() + ", cause: " +
StringUtils.toString(e) + ">";
}
return dataStr;
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册