Merge pull request #275 from xiangli-cmu/fix-put-ttl

Fix put ttl

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)

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()
 	}
 }