Author: jvdrean
Date: 2007-10-29 14:12:03 +0100 (Mon, 29 Oct 2007)
New Revision: 5534

Modified:
   
xwiki-platform/core/branches/xwiki-core-1.1/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/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/XWiki.java
  2007-10-29 13:11:44 UTC (rev 5533)
+++ 
xwiki-platform/core/branches/xwiki-core-1.1/src/main/java/com/xpn/xwiki/XWiki.java
  2007-10-29 13:12:03 UTC (rev 5534)
@@ -2156,7 +2156,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
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to