From e680f28c2f02ce819f2d6e7f1a4f499aa14d8f86 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 15 Oct 2013 23:25:12 -0700 Subject: [PATCH] fix move update check to update handler --- server/v2/put_handler.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/v2/put_handler.go b/server/v2/put_handler.go index 5dcf061c2..336366d38 100644 --- a/server/v2/put_handler.go +++ b/server/v2/put_handler.go @@ -23,11 +23,6 @@ func PutHandler(w http.ResponseWriter, req *http.Request, s Server) error { return etcdErr.NewError(etcdErr.EcodeTTLNaN, "Update", store.UndefIndex, store.UndefTerm) } - // Update should give at least one option - if value == "" && expireTime.Sub(store.Permanent) == 0 { - return etcdErr.NewError(etcdErr.EcodeValueOrTTLRequired, "Update", store.UndefIndex, store.UndefTerm) - } - prevValue, valueOk := req.Form["prevValue"] prevIndexStr, indexOk := req.Form["prevIndex"] prevExist, existOk := req.Form["prevExist"] @@ -100,6 +95,11 @@ func CreateHandler(w http.ResponseWriter, req *http.Request, s Server, key, valu } func UpdateHandler(w http.ResponseWriter, req *http.Request, s Server, key, value string, expireTime time.Time) error { + // Update should give at least one option + if value == "" && expireTime.Sub(store.Permanent) == 0 { + return etcdErr.NewError(etcdErr.EcodeValueOrTTLRequired, "Update", store.UndefIndex, store.UndefTerm) + } + c := &store.UpdateCommand{ Key: key, Value: value,