1 | Index: server/src/ome/security/basic/MergeEventListener.java |
---|
2 | =================================================================== |
---|
3 | --- server/src/ome/security/basic/MergeEventListener.java (revision 971) |
---|
4 | +++ server/src/ome/security/basic/MergeEventListener.java (working copy) |
---|
5 | @@ -91,6 +91,8 @@ |
---|
6 | HibernateUtils.fixNulledOrFilteredCollections( |
---|
7 | (IObject)entity,(IObject)target,persister,source); |
---|
8 | propagateHiddenValues((IObject)entity,(IObject)target); |
---|
9 | +// BUGFIX TEMPORARY |
---|
10 | + revertValues((IObject)entity,(IObject)target); |
---|
11 | } |
---|
12 | super.copyValues(persister, entity, target, source, copyCache); |
---|
13 | } |
---|
14 | @@ -105,6 +107,8 @@ |
---|
15 | HibernateUtils.fixNulledOrFilteredCollections( |
---|
16 | (IObject)entity,(IObject)target,persister,source); |
---|
17 | propagateHiddenValues((IObject)entity, (IObject)target); |
---|
18 | +// BUGFIX TEMPORARY |
---|
19 | + revertValues((IObject)entity,(IObject)target); |
---|
20 | } |
---|
21 | super.copyValues(persister, entity, target, source, copyCache, |
---|
22 | foreignKeyDirection); |
---|
23 | @@ -187,6 +191,14 @@ |
---|
24 | } |
---|
25 | } |
---|
26 | |
---|
27 | + protected void revertValues(IObject from, IObject to) |
---|
28 | + { |
---|
29 | + if ( from.getDetails() != null && to.getDetails() != null ) |
---|
30 | + { |
---|
31 | + from.getDetails().setCreationEvent( to.getDetails().getCreationEvent() ); |
---|
32 | + } |
---|
33 | + } |
---|
34 | + |
---|
35 | private void log(Object...objects) |
---|
36 | { |
---|
37 | if ( log.isDebugEnabled() && objects != null && objects.length > 0) |
---|
38 | Index: server/test/ome/server/itests/ImmutabilityTest.java |
---|
39 | =================================================================== |
---|
40 | --- server/test/ome/server/itests/ImmutabilityTest.java (revision 971) |
---|
41 | +++ server/test/ome/server/itests/ImmutabilityTest.java (working copy) |
---|
42 | @@ -69,8 +69,8 @@ |
---|
43 | |
---|
44 | // This fails because it gets silently copied to our new instance. See: |
---|
45 | // https://trac.openmicroscopy.org.uk/omero/ticket/346 |
---|
46 | - // i = iUpdate.saveAndReturnObject(i); |
---|
47 | - //assertEquals( i.getDetails().getCreationEvent().getId(), oldEvent.getId()); |
---|
48 | + i = iUpdate.saveAndReturnObject(i); |
---|
49 | + assertEquals( i.getDetails().getCreationEvent().getId(), oldEvent.getId()); |
---|
50 | |
---|
51 | // Saving and reacquiring to be sure. |
---|
52 | iUpdate.saveObject(i); |
---|