[xwiki-notifications] r6576 - xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/hibernate

[sdumitriu (SVN)]

Author: sdumitriu
Date: 2008-01-01 02:24:11 +0100 (Tue, 01 Jan 2008)
New Revision: 6576

Modified:
   xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/hibernate/R6430XWIKI1954Migrator.java
Log:
XWIKI-1975: Exception displayed in the log when upgrading from a previous 1.2 release to 1.2 RC2
Fixed. Merged from trunk at 6575


Modified: xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/hibernate/R6430XWIKI1954Migrator.java
===================================================================
--- xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/hibernate/R6430XWIKI1954Migrator.java	2008-01-01 01:22:04 UTC (rev 6575)
+++ xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/store/migration/hibernate/R6430XWIKI1954Migrator.java	2008-01-01 01:24:11 UTC (rev 6576)
@@ -87,8 +87,7 @@
                         stmt.executeUpdate("update xwikidoc set XWD_ARCHIVE=null");
                         stmt.close();
                     } catch (SQLException e) {
-                        throw new XWikiException(XWikiException.MODULE_XWIKI_STORE,
-                            XWikiException.ERROR_XWIKI_STORE_MIGRATION, getName() + " migration failed", e);
+                        // Maybe the column doesn't exist.
                     }
                     return Boolean.TRUE;
                 }