.

wcfs/btree.go

@@ -192,12 +192,25 @@ func (b *ZBucket) PDeactivate() {
 
 // PActivate implements Object.
 func (b *ZBucket) PActivate(ctx context.Context) (bool, error) {
-	// XXX check if already activated
 	activated, err := b.pyObject.PActivate(ctx)
 	if err != nil {
 		return err
 	}
+	if !activated {
+		return false, nil
+	}
+
+	// FIXME other users must wait for first decode to complet
+	err = b.decode()
+	if err != nil {
+		b.pyObject.PDeactivate()
+		return false, err
+	}
+
+	return true, nil
+}
 
+func (b *ZBucket) decode() error {
 	t, ok := b.pyObject.pystate.(pickle.Tuple)
 	if !ok || !(1 <= len(t) && len(t) <= 2) {
 		// XXX complain

wcfs/zodb.go

@@ -533,7 +533,7 @@ func (pyobj *pyObject) PActivate(ctx context.Context) (bool, error) {
 	pyobj.pystate = pystate
 	pyobj.loaderr = err
 	close(pyobj.ready)
-	return err	// XXX err ctx
+	return true, err	// XXX err ctx
 }