From 0b969c4e2bb96b0f302a3da08d98c6c6fb5a7f6e Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Tue, 13 Jan 2015 12:02:30 -0800
Subject: [PATCH] consul: Fixing potential issue with blocking queries for
 {Session,ACL}.Get

---
 consul/acl_endpoint.go     | 2 ++
 consul/session_endpoint.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/consul/acl_endpoint.go b/consul/acl_endpoint.go
index 79d59ec27d..6a7cfc472b 100644
--- a/consul/acl_endpoint.go
+++ b/consul/acl_endpoint.go
@@ -139,6 +139,8 @@ func (a *ACL) Get(args *structs.ACLSpecificRequest,
 			reply.Index = index
 			if acl != nil {
 				reply.ACLs = structs.ACLs{acl}
+			} else {
+				reply.ACLs = nil
 			}
 			return err
 		})
diff --git a/consul/session_endpoint.go b/consul/session_endpoint.go
index 3d97b8bfe8..af4c395048 100644
--- a/consul/session_endpoint.go
+++ b/consul/session_endpoint.go
@@ -117,6 +117,8 @@ func (s *Session) Get(args *structs.SessionSpecificRequest,
 			reply.Index = index
 			if session != nil {
 				reply.Sessions = structs.Sessions{session}
+			} else {
+				reply.Sessions = nil
 			}
 			return err
 		})