aboutsummaryrefslogtreecommitdiffhomepage
path: root/vendor/google.golang.org/appengine/datastore/datastore.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/google.golang.org/appengine/datastore/datastore.go')
-rw-r--r--vendor/google.golang.org/appengine/datastore/datastore.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/google.golang.org/appengine/datastore/datastore.go b/vendor/google.golang.org/appengine/datastore/datastore.go
index 9422e41..576bc50 100644
--- a/vendor/google.golang.org/appengine/datastore/datastore.go
+++ b/vendor/google.golang.org/appengine/datastore/datastore.go
@@ -43,7 +43,8 @@ func (e *ErrFieldMismatch) Error() string {
e.FieldName, e.StructType, e.Reason)
}
-// protoToKey converts a Reference proto to a *Key.
+// protoToKey converts a Reference proto to a *Key. If the key is invalid,
+// protoToKey will return the invalid key along with ErrInvalidKey.
func protoToKey(r *pb.Reference) (k *Key, err error) {
appID := r.GetApp()
namespace := r.GetNameSpace()
@@ -57,7 +58,7 @@ func protoToKey(r *pb.Reference) (k *Key, err error) {
namespace: namespace,
}
if !k.valid() {
- return nil, ErrInvalidKey
+ return k, ErrInvalidKey
}
}
return