Index: /Volumes/2/workspace/mobicents-sip-presence-service/ps-core/publication-sbb/src/main/java/org/mobicents/slee/sippresence/server/publication/PresenceCompositionPolicy.java =================================================================== --- /Volumes/2/workspace/mobicents-sip-presence-service/ps-core/publication-sbb/src/main/java/org/mobicents/slee/sippresence/server/publication/PresenceCompositionPolicy.java (revision 4877) +++ /Volumes/2/workspace/mobicents-sip-presence-service/ps-core/publication-sbb/src/main/java/org/mobicents/slee/sippresence/server/publication/PresenceCompositionPolicy.java (working copy) @@ -93,6 +93,7 @@ // remove the tuples to not be iterated again tuplesIt.remove(); otherTuplesIt.remove(); + break; } } } @@ -313,6 +314,7 @@ } anysIt.remove(); otherAnysIt.remove(); + break; } } else { @@ -336,6 +338,7 @@ } anysIt.remove(); otherAnysIt.remove(); + break; } } else { @@ -348,6 +351,7 @@ result.add(composedObject); anysIt.remove(); otherAnysIt.remove(); + break; } } } @@ -456,6 +460,7 @@ result.add(note); notesIt.remove(); otherNotesIt.remove(); + break; } } // now add the ones left @@ -481,6 +486,7 @@ // remove both to not be iterated again it.remove(); otherIt.remove(); + break; } } } @@ -572,6 +578,7 @@ // remove both to not be iterated again it.remove(); otherIt.remove(); + break; } } } @@ -686,6 +693,7 @@ result.add(note); notesIt.remove(); otherNotesIt.remove(); + break; } } // now add the ones left