Commit 6410356a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 8b37a895
...@@ -401,16 +401,13 @@ func (c *Client) Sync(ctx context.Context) (_ zodb.Tid, err error) { ...@@ -401,16 +401,13 @@ func (c *Client) Sync(ctx context.Context) (_ zodb.Tid, err error) {
} }
func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial zodb.Tid, err error) { func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial zodb.Tid, err error) {
// defer func() ... defer func() {
buf, serial, err = c._Load(ctx, xid)
if err != nil { if err != nil {
err = &zodb.OpError{URL: c.URL(), Op: "load", Args: xid, Err: err} err = &zodb.OpError{URL: c.URL(), Op: "load", Args: xid, Err: err}
} }
return buf, serial, err }()
}
func (c *Client) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, error) { err = c.withOperational(ctx)
err := c.withOperational(ctx)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
...@@ -462,7 +459,7 @@ func (c *Client) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, e ...@@ -462,7 +459,7 @@ func (c *Client) _Load(ctx context.Context, xid zodb.Xid) (*mem.Buf, zodb.Tid, e
return nil, 0, err // XXX err context return nil, 0, err // XXX err context
} }
buf := resp.Data buf = resp.Data
if !xsha1.Skip { if !xsha1.Skip {
checksum := xsha1.Sum(buf.Data) checksum := xsha1.Sum(buf.Data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment