kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CI.

This commit is contained in:
Wu Sheng 2018-07-20 11:50:48 +08:00
parent 62ca37bc8f
commit 4d56a63bd2
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
View File

@ -18,16 +18,14 @@
package org.apache.skywalking.oap.server.cluster.plugin.standalone;
import java.util.ArrayList;
import java.util.List;
import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
import java.util.ArrayList;
import java.util.List;
/**
* A cluster manager simulator. Work in memory only.
* Also return the current instance.
* A cluster manager simulator. Work in memory only. Also return the current instance.
*
* @author peng-yongsheng, Wu Sheng
*/
@ -35,14 +33,13 @@ public class StandaloneManager implements ClusterNodesQuery, ClusterRegister {
private volatile RemoteInstance remoteInstance;
@Override public void registerRemote(RemoteInstance remoteInstance) {
this.remoteInstance = remoteInstance;
}
@Override
public List<RemoteInstance> queryRemoteNodes() {
if(remoteInstance == null){
if (remoteInstance == null) {
return new ArrayList(0);
}
ArrayList remoteList = new ArrayList(1);

2
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java
View File

@ -24,7 +24,7 @@ import org.junit.Test;
public class StandaloneManagerTest {
@Test
public void test(){
public void test() {
StandaloneManager standaloneManager = new StandaloneManager();
RemoteInstance remote1 = new RemoteInstance();
RemoteInstance remote2 = new RemoteInstance();

2
oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTestCase.java
View File

@ -67,7 +67,7 @@ public class ClusterModuleZookeeperProviderTestCase {
for (int i = 0; i < 20; i++) {
List<RemoteInstance> detailsList = clusterNodesQuery.queryRemoteNodes();
if(detailsList.size() == 0){
if (detailsList.size() == 0) {
Thread.sleep(500);
continue;
}

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
View File

@ -82,7 +82,7 @@ public class CoreModuleProvider extends ModuleProvider {
}
@Override public void notifyAfterCompleted() throws ModuleStartException{
@Override public void notifyAfterCompleted() throws ModuleStartException {
try {
grpcServer.start();
jettyServer.start();