[incubator-servicecomb-java-chassis] branch master updated: [SCB-718]fix compile errors

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 064736e  [SCB-718]fix compile errors
064736e is described below

commit 064736e090246d58198b1427601c2fc7372463a1
Author: liubao <ba...@huawei.com>
AuthorDate: Tue Oct 23 18:06:13 2018 +0800

    [SCB-718]fix compile errors
---
 .../apache/servicecomb/it/deploy/MicroserviceDeploy.java    | 13 +++++++++++++
 .../serviceregistry/registry/RemoteServiceRegistry.java     |  1 +
 2 files changed, 14 insertions(+)

diff --git a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/MicroserviceDeploy.java b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/MicroserviceDeploy.java
index 4561e81..94d1180 100644
--- a/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/MicroserviceDeploy.java
+++ b/integration-tests/it-consumer/src/main/java/org/apache/servicecomb/it/deploy/MicroserviceDeploy.java
@@ -75,5 +75,18 @@ public class MicroserviceDeploy extends NormalDeploy {
 
     sendCommand("ms-stop");
     waitStop();
+
+    MicroserviceVersionRule microserviceVersionRule = RegistryUtils.getServiceRegistry().getAppManager()
+        .getOrCreateMicroserviceVersionRule(microserviceDeployDefinition.getAppId(),
+            microserviceDeployDefinition.getMicroserviceName(),
+            microserviceDeployDefinition.getVersion());
+    while (microserviceVersionRule.getInstances().size() > 0) {
+      try {
+        LOGGER.info("{} not stop finished wait.", microserviceDeployDefinition.getDisplayName());
+        Thread.sleep(3000);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    }
   }
 }
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/registry/RemoteServiceRegistry.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/registry/RemoteServiceRegistry.java
index f9dbb46..1dc0be8 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/registry/RemoteServiceRegistry.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/registry/RemoteServiceRegistry.java
@@ -25,6 +25,7 @@ import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
 import org.apache.servicecomb.serviceregistry.client.http.ServiceRegistryClientImpl;
 import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
 import org.apache.servicecomb.serviceregistry.definition.MicroserviceDefinition;
+import org.apache.servicecomb.serviceregistry.task.HeartbeatResult;
 import org.apache.servicecomb.serviceregistry.task.MicroserviceInstanceHeartbeatTask;
 import org.apache.servicecomb.serviceregistry.task.event.PeriodicPullEvent;
 import org.apache.servicecomb.serviceregistry.task.event.PullMicroserviceVersionsInstancesEvent;