fix EvictionTest data race error

jolestar · Jan 4, 2016 · 842df2d · 842df2d
1 parent 0c5dc20
commit 842df2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Go Commons Pool
 
 [![Build Status](https://travis-ci.org/jolestar/go-commons-pool.svg?branch=master)](https://travis-ci.org/jolestar/go-commons-pool)
 [![Circle CI](https://circleci.com/gh/jolestar/go-commons-pool.svg?style=svg)](https://circleci.com/gh/jolestar/go-commons-pool)
-[![Coverage Status](https://coveralls.io/repos/jolestar/go-commons-pool/badge.svg?branch=master&service=github&_day=201603)](https://coveralls.io/github/jolestar/go-commons-pool?branch=master)
+[![Coverage Status](https://coveralls.io/repos/jolestar/go-commons-pool/badge.svg?branch=master&service=github&_day=201604)](https://coveralls.io/github/jolestar/go-commons-pool?branch=master)
 [![GoDoc](http://godoc.org/github.com/jolestar/go-commons-pool?status.svg)](http://godoc.org/github.com/jolestar/go-commons-pool)
 
 The Go Commons Pool is a [Go](http://golang.org/) generic object pool, direct translate from [Apache Commons Pool](https://commons.apache.org/proper/commons-pool/).

diff --git a/object.go b/object.go
@@ -172,7 +172,9 @@ func (this *PooledObject) markReturning() {
 	this.state = RETURNING
 }
 
-func (this *PooledObject) startEvictionTest() bool {
+func (this *PooledObject) StartEvictionTest() bool {
+	this.lock.Lock()
+	defer this.lock.Unlock()
 	if this.state == IDLE {
 		this.state = EVICTION
 		return true
@@ -181,7 +183,9 @@ func (this *PooledObject) startEvictionTest() bool {
 	return false
 }
 
-func (this *PooledObject) endEvictionTest(idleQueue *collections.LinkedBlockDeque) bool {
+func (this *PooledObject) EndEvictionTest(idleQueue *collections.LinkedBlockDeque) bool {
+	this.lock.Lock()
+	defer this.lock.Unlock()
 	if this.state == EVICTION {
 		this.state = IDLE
 		return true

diff --git a/pool.go b/pool.go
@@ -583,7 +583,7 @@ func (this *ObjectPool) evict() {
 				continue
 			}
 
-			if !underTest.startEvictionTest() {
+			if !underTest.StartEvictionTest() {
 				// Object was borrowed in another thread
 				// Don't count this as an eviction test so reduce i;
 				i--
@@ -625,7 +625,7 @@ func (this *ObjectPool) evict() {
 						}
 					}
 				}
-				if !underTest.endEvictionTest(this.idleObjects) {
+				if !underTest.EndEvictionTest(this.idleObjects) {
 					// TODO - May need to add code here once additional
 					// states are used
 				}