mirror of
https://github.com/usatiuk/dhfs.git
synced 2025-10-29 04:57:48 +01:00
Revert "handle deleted objects in getObject pushedMoves"
This reverts commit 81de8084a7.
This commit is contained in:
@@ -80,22 +80,13 @@ public class RemoteObjectServiceServer implements DhfsObjectSyncGrpc {
|
||||
continue;
|
||||
}
|
||||
|
||||
ObjectHeader header;
|
||||
|
||||
try {
|
||||
header = obj.get().runReadLocked(JObject.ResolutionStrategy.NO_RESOLUTION, (m, d) -> {
|
||||
if (m.getKnownClass().isAnnotationPresent(PushResolution.class))
|
||||
throw new NotImplementedException();
|
||||
|
||||
return m.toRpcHeader();
|
||||
});
|
||||
} catch (DeletedObjectAccessException e) {
|
||||
it.remove();
|
||||
continue;
|
||||
}
|
||||
|
||||
builder.addPushedMoves(PushedMove.newBuilder()
|
||||
.setParent(header)
|
||||
.setParent((ObjectHeader) obj.get().runReadLocked(JObject.ResolutionStrategy.NO_RESOLUTION, (m, d) -> {
|
||||
if (m.getKnownClass().isAnnotationPresent(PushResolution.class))
|
||||
throw new NotImplementedException();
|
||||
|
||||
return m.toRpcHeader();
|
||||
}))
|
||||
.setKid(next.child())
|
||||
.build());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user