[xwiki-notifications] r7540 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc

[SVN]

Author: sdumitriu
Date: 2008-02-12 13:45:56 +0100 (Tue, 12 Feb 2008)
New Revision: 7540

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcHandler.java
Log:
XWIKI-2108: XMLRPC servlet does not store all the page metadata
Fix some wrong behavior


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcHandler.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcHandler.java
   2008-02-12 12:11:33 UTC (rev 7539)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcHandler.java
   2008-02-12 12:45:56 UTC (rev 7540)
@@ -666,15 +666,17 @@
         if (page.getModified() != null) {
             doc.setDate(page.getModified());
         }
-        if (!StringUtils.isBlank(page.getTitle())) {
-            doc.setTitle(page.getTitle());
-        }
         try {
             if (page.getVersion() > 0) {
                 long v = page.getVersion();
                 int minor = (int) (v % 16);
                 int major = (int) (v >> 16) + 1;
-                doc.setVersion(major + "." + minor);
+                String newVersion = major + "." + minor;
+                if (newVersion != doc.getVersion()) {
+                    doc.setVersion(newVersion);
+                    doc.setMetaDataDirty(false);
+                    doc.setContentDirty(false);
+                }
             }
         } catch (Exception ex) {
             // A NPE gets thrown here if the version was not set on the 
client. Probably a bug in

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