[ARVADOS] updated: f565fb6f6a3be1222ee364d52a15fc7ab467a008

[git at public.curoverse.com]

Summary of changes:
 services/keepstore/handler_test.go | 4 ++++
 services/keepstore/handlers.go     | 8 --------
 2 files changed, 4 insertions(+), 8 deletions(-)

       via  f565fb6f6a3be1222ee364d52a15fc7ab467a008 (commit)
      from  7f28788a82182d96c9bf0792fe6c1682714ea28f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f565fb6f6a3be1222ee364d52a15fc7ab467a008
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Mar 23 12:11:42 2015 -0400

    3762: create NewWorkQueue instances of pullq and trashq in handers_test and remove this logic from handlers.
    it is expected that keepstore or the tests will create these objects and handlers should not have to.

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 05b410c..9ad77bf 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -545,6 +545,8 @@ func TestPullHandler(t *testing.T) {
 	var user_token = "USER TOKEN"
 	data_manager_token = "DATA MANAGER TOKEN"
 
+	pullq = NewWorkQueue()
+
 	good_json := []byte(`[
 		{
 			"locator":"locator_with_two_servers",
@@ -649,6 +651,8 @@ func TestTrashHandler(t *testing.T) {
 	var user_token = "USER TOKEN"
 	data_manager_token = "DATA MANAGER TOKEN"
 
+	trashq = NewWorkQueue()
+
 	good_json := []byte(`[
 		{
 			"locator":"block1",
diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index c7559a1..f120f05 100644
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -460,10 +460,6 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) {
 	for _, p := range pr {
 		plist.PushBack(p)
 	}
-
-	if pullq == nil {
-		pullq = NewWorkQueue()
-	}
 	pullq.ReplaceQueue(plist)
 }
 
@@ -498,10 +494,6 @@ func TrashHandler(resp http.ResponseWriter, req *http.Request) {
 	for _, t := range trash {
 		tlist.PushBack(t)
 	}
-
-	if trashq == nil {
-		trashq = NewWorkQueue()
-	}
 	trashq.ReplaceQueue(tlist)
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--