stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

put assumeUnique into a better place

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-22 09:55:05 +02:00
parent d10cf7c856
commit b765fcf4fe
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
View File

@@ -15,7 +15,8 @@ public class JObject<T extends JObjectData> implements Serializable {
_metaPart = new ObjectMetadata(name, conflictResolver, obj.getClass());
_dataPart.set(obj);
// FIXME:?
_resolver.bumpVersionSelf(this);
if (!obj.assumeUnique())
_resolver.bumpVersionSelf(this);
}
protected JObject(JObjectResolver resolver, ObjectMetadata objectMetadata) {

3
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObjectManagerImpl.java
View File

@@ -177,9 +177,6 @@ public class JObjectManagerImpl implements JObjectManager {
return (JObject<D>) inMap;
} else {
var created = new JObject<D>(jObjectResolver, object.getName(), object.getConflictResolver().getName(), object);
// FIXME:
if (object.assumeUnique())
created.runWriteLockedMeta((m, a, b) -> m.getChangelog().put(selfname, 0L));
_map.put(object.getName(), new NamedSoftReference(created, _refQueue));
jObjectResolver.notifyWrite(created);
addToNursery(created.getName());