This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 23755b8 Fix nacos override demo reset env (#331)
23755b8 is described below
commit 23755b8b46535442af9917936658230a24e27fdc
Author: Albumen Kevin <[email protected]>
AuthorDate: Thu Jun 10 18:17:19 2021 +0800
Fix nacos override demo reset env (#331)
---
dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml | 2 +-
.../java/org/apache/dubbo/samples/governance/DemoServiceIT.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml
b/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml
index 9736e7f..80e43a1 100644
--- a/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml
+++ b/dubbo-samples-nacos/dubbo-samples-nacos-override/pom.xml
@@ -31,7 +31,7 @@
<properties>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
- <dubbo.version>2.7.7</dubbo.version>
+ <dubbo.version>2.7.11</dubbo.version>
<spring.version>4.3.16.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.25</slf4j.version>
diff --git
a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
index c287968..17899df8c 100644
---
a/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
+++
b/dubbo-samples-nacos/dubbo-samples-nacos-override/src/test/java/org/apache/dubbo/samples/governance/DemoServiceIT.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.samples.governance;
+import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.samples.governance.api.DemoService;
import org.apache.dubbo.samples.governance.util.NacosUtils;
@@ -29,7 +30,11 @@ public class DemoServiceIT {
@Before
public void beforeTest() {
- //DubboBootstrap.reset();
+ try {
+ DubboBootstrap.reset();
+ } catch (Throwable ignore) {
+ // since Dubbo 2.7.11
+ }
}
@Test(expected = RpcException.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
