diff --git a/src/mesh/model/associations/Association.as b/src/mesh/model/associations/Association.as index e02fbee..ef98cf3 100644 --- a/src/mesh/model/associations/Association.as +++ b/src/mesh/model/associations/Association.as @@ -49,7 +49,7 @@ package mesh.model.associations */ protected function associate(entity:Entity):void { - if (owner.store && entity.store == null) owner.store.add(entity); + if (owner.store != null && entity.store == null) owner.store.add(entity); _entities.add(entity); populateInverseRelationship(entity); } diff --git a/src/mesh/model/associations/AssociationCollection.as b/src/mesh/model/associations/AssociationCollection.as index c11a152..5989a0f 100644 --- a/src/mesh/model/associations/AssociationCollection.as +++ b/src/mesh/model/associations/AssociationCollection.as @@ -80,15 +80,11 @@ package mesh.model.associations private function handleEntitiesReset():void { for each (var oldEntity:Entity in _snapshot) { - if (_list.getItemIndex(oldEntity) == -1) { - handleEntitiesRemoved([oldEntity]); - } + handleEntitiesRemoved([oldEntity]); } for each (var newEntity:Entity in _list.toArray()) { - if (_snapshot.indexOf(newEntity) == -1) { - handleEntitiesAdded([newEntity]); - } + handleEntitiesAdded([newEntity]); } }