Merge pull request #3345 from ipfs/fix/namesys/error-return

namesys: return right after errors
ipfs · Nov 3, 2016 · 9d132e7 · 9d132e7
2 parents 1261b90 + b78b29c
commit 9d132e7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/namesys/routing.go b/namesys/routing.go
@@ -147,13 +147,16 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string) (path.Pa
 		if err != nil {
 			log.Warning("RoutingResolve get failed.")
 			resp <- err
+			return
 		}
 
 		entry = new(pb.IpnsEntry)
 		err = proto.Unmarshal(val, entry)
 		if err != nil {
 			resp <- err
+			return
 		}
+
 		resp <- nil
 	}()
 
@@ -162,7 +165,9 @@ func (r *routingResolver) resolveOnce(ctx context.Context, name string) (path.Pa
 		pubk, err := routing.GetPublicKey(r.routing, ctx, hash)
 		if err != nil {
 			resp <- err
+			return
 		}
+
 		pubkey = pubk
 		resp <- nil
 	}()