[AMQ-6783] VMTransportFactory code improvements

• Type: Bug
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: 5.16.0
• Component/s: Broker
• Patch Info: Patch Available
• Flags: Patch
• Assignee: Matt Pavlovich
• Reporter: Giovanni Liva
• Created: 03/Aug/17 07:31
• Updated: 13/Oct/20 21:32

Description

I the class org.apache.activemq.transport.vm.VMTransportFactory we can optimize the code of the lookupBroker method.
When it is called with waitForStart setted to -1, the while loop is never executed.
I suggest to change the if condition from:

if (broker == null || waitForStart > 0) {
  final long expiry = System.currentTimeMillis() + waitForStart;
  while ((broker == null || !broker.isStarted()) && expiry > System.currentTimeMillis()) {
...
}

To:

if (broker == null && waitForStart > 0) {
  final long expiry = System.currentTimeMillis() + waitForStart;
  while ((broker == null || !broker.isStarted()) && expiry > System.currentTimeMillis()) {
...
}