Manual merge.

2017-02-25 20:07:49 +08:00 · 2017-02-25 20:07:49 +08:00 · 83b8a173ac
parent 2e0f56f511
commit 83b8a173ac
1 changed files with 0 additions and 5 deletions
--- a/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
+++ b/skywalking-collector/skywalking-collector-actor/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorker.java
@ -41,14 +41,9 @@ public abstract class AbstractWorker<T> extends UntypedActor {
        }
    }

-<<<<<<< HEAD
-    protected void tell(String workerRole, WorkerRouter router, Object message) throws Throwable {
-        router.find(workerRole).tell(message, getSelf());
-=======
    public void tell(AbstractWorkerProvider targetWorkerProvider, WorkerSelector selector, T message) throws Throwable {
        List<ActorRef> avaibleWorks = WorkersRefCenter.INSTANCE.availableWorks(targetWorkerProvider.roleName());
        selector.select(avaibleWorks, message).tell(message, getSelf());
->>>>>>> e93c6a65c448419bb87c0777b3c42dfc425d533b
    }

    void register(Member member) {