Index: core/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java =================================================================== --- core/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java (revision 23543) +++ core/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java (working copy) @@ -2629,8 +2629,8 @@ Iterator it = doc.getxWikiObjects().values().iterator(); while (it.hasNext()) { Vector objects = (Vector) it.next(); - for (int i = 0; i < objects.size(); i++) { - BaseObject obj = (BaseObject) objects.get(i); + if (objects.size() > 0) { + BaseObject obj = (BaseObject) objects.get(0); if (obj != null) { result |= injectCustomMapping(obj.getxWikiClass(context), context); }