I finally got back to this!
Stuff to merge for SAK-11544
I took a copy of the 2-5-x code and reapplied the mods to that code and tested it. I attach the file that should slide right into 2-5-x.
search-impl/impl/src/java/org/sakaiproject/search/component/adapter/message/MessageContentProducer.java
Actually most of the differences were in formatting – someone had checked out the code – made a small mod but reformatted the code w.r.t. line ends and checked it back in. So it looks like there are lots of differences – it was not a refactor – just a reformat :)
This code should go in and make pretty diffs.