Author: jvdrean
Date: 2007-10-29 14:16:23 +0100 (Mon, 29 Oct 2007)
New Revision: 5535
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 13:12:03 UTC (rev 5534)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
2007-10-29 13:16:23 UTC (rev 5535)
@@ -2194,11 +2194,13 @@
if (bobj != null) {
String host = bobj.getStringValue("server");
if ((host != null) && (!"".equals(host))) {
- try {
- if (virtualWikiMap != null &&
virtualWikiMap.getFromCache(host) != null)
- virtualWikiMap.flushEntry(host);
- } catch (XWikiCacheNeedsRefreshException e) {
- virtualWikiMap.cancelUpdate(host);
+ if (virtualWikiMap != null) {
+ try {
+ if (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