[xwiki-notifications] r5533 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki

[SVN]

Author: jvdrean
Date: 2007-10-29 14:11:44 +0100 (Mon, 29 Oct 2007)
New Revision: 5533

Modified:
   xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
Log:
XWIKI-1829 : Error while importing a XAR containing XWiki.XWikiServerClass 
object(s) in a non-virtual wiki

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java 
2007-10-29 11:52:17 UTC (rev 5532)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java 
2007-10-29 13:11:44 UTC (rev 5533)
@@ -2195,7 +2195,7 @@
                     String host = bobj.getStringValue("server");
                     if ((host != null) && (!"".equals(host))) {
                         try {
-                            if (virtualWikiMap.getFromCache(host) != null)
+                            if (virtualWikiMap != null && 
virtualWikiMap.getFromCache(host) != null)
                                 virtualWikiMap.flushEntry(host);
                         } catch (XWikiCacheNeedsRefreshException e) {
                             virtualWikiMap.cancelUpdate(host);

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications