Skip to content

Commit 2c4dc6c

Browse files
committed
fix com.alibaba.dubbo.common.json.JSONTest#testException failure
1 parent 6b9452a commit 2c4dc6c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

dubbo-common/src/main/java/com/alibaba/dubbo/common/json/GenericJSONConverter.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
/*
2-
* Copyright 1999-2011 Alibaba Group.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
1+
/*
2+
* Copyright 1999-2011 Alibaba Group.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
1616
package com.alibaba.dubbo.common.json;
1717

1818
import java.io.IOException;
@@ -115,7 +115,8 @@ else if( Collection.class.isAssignableFrom(c) )
115115
{
116116
if ((obj instanceof Throwable) && (
117117
"localizedMessage".equals(pn)
118-
|| "cause".equals(pn)
118+
|| "cause".equals(pn)
119+
|| "suppressed".equals(pn)
119120
|| "stackTrace".equals(pn))) {
120121
continue;
121122
}

dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
public class JSONTest {
3232
@Test
33-
@Ignore
3433
public void testException() throws Exception {
3534
MyException e = new MyException("001", "AAAAAAAA");
3635

0 commit comments

Comments
 (0)