It turns out that the changes from foundation-2016 are still valid in foundation-2017, they were just placed differently which caused the confusion. I've added an additional commit with the missing change.

I'm going to merge foundation-2016 to foundation-2017 as I described above.

The main different in terms of updating the status is the following:

In foundation-2016 this is done by performing an actual DAO call (the main intention of this refactoring was avoid retrieving the object through the DAO as the object was already available, before perform the update+save). Now in foundation-2017 the update is performed by just calling PollableService.updateStatus, and I can't see DAO calls involved:

https://github.com/OpenNMS/opennms/blob/foundation-2017/opennms-services/src/main/java/org/opennms/netmgt/poller/pollables/PollableService.java#L302

After the merge, I'll repeat the tests to be sure that foundation-2017 doesn't suffer the same problem.

You're welcome!

It turns out that in foundation-2017 the solution is different. I'll port the refactor of the code that is written twice, but I'll keep the logic for update the service status as it doesn't involve DAO calls in foundation-2017 (apparently). I'll repeat the tests on a VM with this branch to be sure.

I tested the patch again, works like a charm, I must of missed something the first time.

Thanks for resolving this one.

https://github.com/OpenNMS/opennms/pull/1438