From 0e47f0d3c74253c449d7727274dcf5eccba91f93 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 26 Sep 2017 12:54:13 +0800
Subject: [PATCH] remove unused count variables

---
 engine_group.go        | 5 +----
 engine_group_policy.go | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/engine_group.go b/engine_group.go
index 8b8118be..5e659aaf 100644
--- a/engine_group.go
+++ b/engine_group.go
@@ -17,7 +17,7 @@ type EngineGroup struct {
 	policy GroupPolicy
 }
 
-func NewGroup(args1 interface{}, args2 interface{}, policies ...GroupPolicy) (*EngineGroup, error) {
+func NewEngineGroup(args1 interface{}, args2 interface{}, policies ...GroupPolicy) (*EngineGroup, error) {
 	var eg EngineGroup
 	if len(policies) > 0 {
 		eg.policy = policies[0]
@@ -73,9 +73,6 @@ func (eg *EngineGroup) Slave() *Engine {
 	case 1:
 		return eg.slaves[0]
 	}
-	if eg.s_count == 1 {
-		return eg.slaves[0]
-	}
 	return eg.policy.Slave(eg)
 }
 
diff --git a/engine_group_policy.go b/engine_group_policy.go
index c4fdcb0d..c3e528ad 100644
--- a/engine_group_policy.go
+++ b/engine_group_policy.go
@@ -68,16 +68,17 @@ func NewRoundRobinPolicy() *RoundRobinPolicy {
 }
 
 func (policy *RoundRobinPolicy) Slave(g *EngineGroup) *Engine {
+	var slaves = g.Slaves()
 	var pos int
 	policy.lock.Lock()
 	policy.pos++
-	if policy.pos >= g.s_count {
+	if policy.pos >= len(slaves) {
 		policy.pos = 0
 	}
 	pos = policy.pos
 	policy.lock.Unlock()
 
-	return g.Slaves()[pos]
+	return slaves[pos]
 }
 
 type WeightRoundRobinPolicy struct {