Starting the cms twice triggers the update modules twice

With multiple upgrade modules (such as in the ecm trunk), the cms cannot be restarted.

I've heard reports about this problem before, now it's easily reproducible with the trunk.

console output (with info logging for the upgrade package):

17.02.2010 17:28:19 INFO [org.hippoecm.repository.LocalHippoRepository.initializeStartup():314] Automatic upgrade enabled: true
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.prepare():346] Migration cycle starting with version tags: v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.prepare():346] Migration cycle starting with version tags: v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():586] upgrade cycle starting
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():586] upgrade cycle starting
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():740] upgrade preprocess cycle for module default-content-upgrade-v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():740] upgrade preprocess cycle for module default-content-upgrade-v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():744] upgrade handling namespace defaultcontent
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():744] upgrade handling namespace defaultcontent
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():757] upgrade registering new prefix defaultcontent_1_6 to http://www.hippoecm.org/defaultcontent/nt/1.6
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():757] upgrade registering new prefix defaultcontent_1_6 to http://www.hippoecm.org/defaultcontent/nt/1.6
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

basedocument
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

basedocument
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

address
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

address
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

article
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

article
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

news
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

news
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

event
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

event
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

overview
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.preprocess():771] upgrade registering new nodetype

{http://www.hippoecm.org/defaultcontent/nt/1.6}

overview
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():588] upgrade cycle traverse process
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():588] upgrade cycle traverse process
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.process():783] migration update traverse for module default-content-upgrade-v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.process():783] migration update traverse for module default-content-upgrade-v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():590] upgrade cycle traverse process commit
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():590] upgrade cycle traverse process commit
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():593] upgrade cycle traverse process save
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():593] upgrade cycle traverse process save
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():595] upgrade cycle iterated process
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():595] upgrade cycle iterated process
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():599] migration update cycle for module default-content-upgrade-v12a
17.02.2010 17:28:20 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():599] migration update cycle for module default-content-upgrade-v12a
17.02.2010 17:28:21 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():614] migration update iterated for module default-content-upgrade-v12a (NamespaceVisitor[defaultcontent]) 0 nodes
17.02.2010 17:28:21 INFO [org.hippoecm.repository.updater.UpdaterEngine.upgrade():614] migration update iterated for module default-content-upgrade-v12a (NamespaceVisitor[defaultcontent]) 0 nodes
17.02.2010 17:28:21 ERROR [org.hippoecm.repository.updater.UpdaterEngine.migrate():563] error in migration cycle: javax.jcr.query.InvalidQueryException: defaultcontent: is not a registered namespace prefix.
javax.jcr.query.InvalidQueryException: defaultcontent: is not a registered namespace prefix.
at org.apache.jackrabbit.spi.commons.query.sql.JCRSQLQueryBuilder.createQuery(JCRSQLQueryBuilder.java:166)
at org.apache.jackrabbit.spi.commons.query.sql.QueryBuilder.createQueryTree(QueryBuilder.java:39)
at org.apache.jackrabbit.spi.commons.query.QueryParser.parse(QueryParser.java:57)
at org.apache.jackrabbit.core.query.lucene.QueryImpl.<init>(QueryImpl.java:92)
at org.apache.jackrabbit.core.query.lucene.SearchIndex.createExecutableQuery(SearchIndex.java:618)
at org.apache.jackrabbit.core.query.QueryImpl.init(QueryImpl.java:128)
at org.apache.jackrabbit.core.SearchManager.createQuery(SearchManager.java:316)
at org.apache.jackrabbit.core.query.QueryManagerImpl.createQuery(QueryManagerImpl.java:102)
at org.hippoecm.repository.decorating.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42)
at org.hippoecm.repository.impl.QueryManagerDecorator.createQuery(QueryManagerDecorator.java:42)
at org.hippoecm.repository.ext.UpdaterItemVisitor$NodeTypeVisitor.iterator(UpdaterItemVisitor.java:397)
at org.hippoecm.repository.updater.UpdaterEngine.upgrade(UpdaterEngine.java:605)
at org.hippoecm.repository.updater.UpdaterEngine.migrate(UpdaterEngine.java:535)
at org.hippoecm.repository.LocalHippoRepository.initializeStartup(LocalHippoRepository.java:346)
at org.hippoecm.repository.LocalHippoRepository.initialize(LocalHippoRepository.java:275)
at org.hippoecm.repository.LocalHippoRepository.<init>(LocalHippoRepository.java:152)
at org.hippoecm.repository.LocalHippoRepository.create(LocalHippoRepository.java:160)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.hippoecm.repository.HippoRepositoryFactory.getHippoRepository(HippoRepositoryFactory.java:180)
at org.hippoecm.repository.RepositoryServlet.init(RepositoryServlet.java:154)
at org.mortbay.jetty.servlet.ServletHolder.initServlet(ServletHolder.java:433)
at org.mortbay.jetty.servlet.ServletHolder.doStart(ServletHolder.java:256)
at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
at org.mortbay.jetty.servlet.ServletHandler.initialize(ServletHandler.java:612)
at org.mortbay.jetty.servlet.Context.startContext(Context.java:139)
at org.mortbay.jetty.webapp.WebAppContext.startContext(WebAppContext.java:1216)
at org.mortbay.jetty.handler.ContextHandler.doStart(ContextHandler.java:509)
at org.mortbay.jetty.webapp.WebAppContext.doStart(WebAppContext.java:447)
at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
at org.mortbay.jetty.handler.HandlerWrapper.doStart(HandlerWrapper.java:117)
at org.mortbay.jetty.Server.doStart(Server.java:222)
at org.mortbay.component.AbstractLifeCycle.start(AbstractLifeCycle.java:40)
at runjettyrun.Bootstrap.main(Bootstrap.java:121)