Author: vmassol
Date: 2008-02-25 14:57:29 +0100 (Mon, 25 Feb 2008)
New Revision: 7928

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
Log:
XWIKI-2150: Error when importing a document containing a class definition and 
objects of that class
Patch submitted by Artem Melentev

Note that this also fixes the problem reported in 
http://jira.xwiki.org/jira/browse/XWIKI-2134#action_23281

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
     2008-02-25 12:43:58 UTC (rev 7927)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
     2008-02-25 13:57:29 UTC (rev 7928)
@@ -376,6 +376,8 @@
                 bclass.setName(doc.getFullName());
                 if ((bclass.getFieldList().size()>0)&&(useClassesTable(true, 
context)))
                     saveXWikiClass(bclass, context, false);
+                // Store this XWikiClass in the context so that we can use it 
in case of recursive usage of classes
+                context.addBaseClass(bclass);
                 // update objects of the class
                 for (Iterator itf=bclass.getFieldList().iterator(); 
itf.hasNext(); ) {
                     PropertyClass prop = (PropertyClass) itf.next();

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

Reply via email to