// TODO: Andrus, 1/24/2006 implement smart merge for modified objects...
if (peerState != PersistenceState.HOLLOW
&& object.getPersistenceState() != PersistenceState.MODIFIED
&& object.getPersistenceState() != PersistenceState.DELETED) {
descriptor.shallowMerge(peerInParentContext, object);
if (object.getPersistenceState() == PersistenceState.HOLLOW) {
object.setPersistenceState(PersistenceState.COMMITTED);
}
}