Hi all, When the XWiki class is instantiated, it is done in a way that made it almost singleton, except for one special case that seems to be for test purposed, but I feel it is now useless. I am asking because if XWiki is a singleton, some very often used synchronisation could be optimized to avoid useless locking. Here is the excerpt from getMainXWiki() that shows this special case: String xwikiname = "xwiki"; XWiki xwiki = null; XWikiEngineContext econtext = context.getEngineContext(); try { if (context.getRequest().getRequestURL().indexOf("/ testbin/") != -1) { xwikiname = "xwikitest"; context.setDatabase("xwikitest"); context.setOriginalDatabase("xwikitest"); } } catch (Exception e) { } context.setMainXWiki(xwikiname); Anyone knows for what it was ? is it still in use ? could it be removed ? Denis