Int 2226 maint

[olegz]

No description provided.

[markfisher]

A couple comments/questions which would also apply in hindsight to the master branch version of these changes.

1. should we actually store Lock objects (ReadWrite) and replace the simple synchronized blocks with lock acquisition and release calls?
2. If the answer to Touched an inappropriate file #1 is NO, then as a minor naming thing, I would probably call the current "locks" just "monitors" since that's the role they are playing
3. I might also simplify the 'groupIdToMessageGroup' name to just 'groupMap' or even 'groups' since using the group ID as the key seems intuitive enough that such detail is not needed in the name of the map.

[olegz]

This is only about SimpleMessageStore (in memory) so I am not sure what do you mean when you say 'store Lock objects' os I say NO.

Yes I agree with renaming

[markfisher]

I was talking about java.util.concurrent.locks.ReadWriteLock, which is precisely for in-VM. If synchronized blocks are sufficient, then fine, but ReadWriteLocks are obviously more versatile.

[markfisher]

It looks like you did not synch your local 'maint' branch before creating this one on top of it.

[olegz]

Try now