From 1fb3799118ba2669e478b9a312b50539e512f60d Mon Sep 17 00:00:00 2001
From: Xiang Li <xiang.li@coreos.com>
Date: Sat, 26 Oct 2013 21:04:44 -0700
Subject: [PATCH] fix put ttl

---
 server/v2/put_handler.go | 9 +++++----
 store/node.go            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/v2/put_handler.go b/server/v2/put_handler.go
index 536bbe216..71c5401f5 100644
--- a/server/v2/put_handler.go
+++ b/server/v2/put_handler.go
@@ -72,10 +72,11 @@ func PutHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	}
 
 	c = &store.CompareAndSwapCommand{
-		Key:       key,
-		Value:     value,
-		PrevValue: prevValue,
-		PrevIndex: prevIndex,
+		Key:        key,
+		Value:      value,
+		PrevValue:  prevValue,
+		PrevIndex:  prevIndex,
+		ExpireTime: expireTime,
 	}
 
 	return s.Dispatch(c, w, req)
diff --git a/store/node.go b/store/node.go
index bbb971bd4..7203edd5f 100644
--- a/store/node.go
+++ b/store/node.go
@@ -372,8 +372,8 @@ func (n *Node) UpdateTTL(expireTime time.Time) {
 		}
 	}
 
+	n.ExpireTime = expireTime
 	if expireTime.Sub(Permanent) != 0 {
-		n.ExpireTime = expireTime
 		n.Expire()
 	}
 }