is to further modify resolveContexts to not break out of the loop once it resolves some contexts for a state, e.g.         *boolean* resolutions = *true*;       *while* (resolutions || onDemandEnabled)       {          *if* (onDemandEnabled)             wasOnDemandEnabled = *true*;          onDemandEnabled = *false*;          resolutions = *false*;          *for* (ControllerState fromState : stateModel)          {             ControllerState toState = stateModel.getNextState(fromState);             *if* (stateModel.isValidState(toState))             {                *if* (resolveContexts(fromState, toState, trace))                {                   resolutions = *true*; //                  break;  // Don't exit here                }             }          }       }

All tests pass apart from the ones mentioned in http://community.jboss.org/message/524862#524862 which I know how to fix if Ales agrees: > mailto:kabir.khan@jboss.com wrote: >   > I mean this: >   > *public* *void* testPlainLifecycleDependencyWrongOrder() *throws* Throwable >    { >       plainLifecycleDependencyWrongOrder(); >   >       ControllerContext context2 = assertInstall(1, "Name2", ControllerState.+CONFIGURED+); >       ControllerContext context1 = assertInstall(0, "Name1"); > +assertEquals+(ControllerState.+INSTALLED+, context2.getState()); >   > SimpleBeanWithLifecycle bean1 = (SimpleBeanWithLifecycle) context1.getTarget(); > +assertNotNull+(bean1); >   > SimpleBeanWithLifecycle bean2 = (SimpleBeanWithLifecycle) context2.getTarget(); > +assertNotNull+(bean2); >   > +assertEquals+(1, bean1.createOrder); > +assertEquals+(2, bean2.createOrder); > +assertEquals+(3, bean1.startOrder); > +assertEquals+(4, bean2.startOrder); >    } > > The new resolver works with > +assertEquals+(1, bean1.createOrder); > +assertEquals+(2, bean1.startOrder); > +assertEquals+(3, bean2.createOrder); > +assertEquals+(4, bean2.startOrder); > > The actual hardcoded orders of beans 1 and 2 is an implemetation detail as I see it. The real check is making sure that the initial install of context 2 does not go beyond CONFIGURED and: > bean1.startOrder > bean1.createOrder > bean2.startOrder > bean2.createOrder > bean2.createOrder > bean1.createOrder > bean2.startOrder > bean1.startOrder > >