commit 3f4e67882bd6cf14a41f398f9d641a7eb3f0af49
author Benjamin Prosnitz <bprosnitz@google.com> Tue Feb 03 19:25:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 03 19:25:34 2015 +0000
tree b637b5b50e507bca4b222a2184b22afee171d274
parent fb37789af4b075a1a3418a91530ef89684cc6d7a
parent c97fe19e9a564f1dc0f49c6ec03a374610b242cf

Merge "uniqueid.ID -> uniqueid.Id"

services/mgmt/application/impl/dispatcher.go

diff --git a/services/mgmt/application/impl/dispatcher.go b/services/mgmt/application/impl/dispatcher.go
index a825137..6b13186 100644
--- a/services/mgmt/application/impl/dispatcher.go
+++ b/services/mgmt/application/impl/dispatcher.go
@@ -39,7 +39,7 @@
 		// (Re)set the root ACLs.
 		path := naming.Join("/acls", "data")
 		_, tag, err := getACL(store, path)
-		if !verror.Is(err, ErrNotFound.ID) {
+		if err != nil && !verror.Is(err, ErrNotFound.ID) {
 			return nil, err
 		}
 		if err := setACL(store, path, acls, tag); err != nil {