r1570 - xwiki/trunk/core/src/main/java/com/xpn/xwiki/api

[Jeremi Joslin]

Author: jeremi
Date: 2006-11-15 12:59:45 +0100 (Wed, 15 Nov 2006)
New Revision: 1570

Modified:
   xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
Log:
reset the XWikidocument after a save

Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-15 11:10:21 UTC (rev 1569)
+++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/api/Document.java	2006-11-15 11:59:45 UTC (rev 1570)
@@ -1158,8 +1158,9 @@
     }
 
     public void save() throws XWikiException {
-        if (hasAccessLevel("edit"))
-            context.getWiki().saveDocument(getDoc(), olddoc, context);
+        if (hasAccessLevel("edit")){
+            saveDocument();
+        }
         else {
             java.lang.Object[] args = {getDoc().getFullName()};
             throw new XWikiException(XWikiException.MODULE_XWIKI_ACCESS, XWikiException.ERROR_XWIKI_ACCESS_DENIED,
@@ -1168,8 +1169,9 @@
     }
 
     public void saveWithProgrammingRights() throws XWikiException {
-        if (checkProgrammingRights())
-            context.getWiki().saveDocument(getDoc(), olddoc, context);
+        if (checkProgrammingRights()){
+            saveDocument();
+        }
         else {
             java.lang.Object[] args = {getDoc().getFullName()};
             throw new XWikiException(XWikiException.MODULE_XWIKI_ACCESS, XWikiException.ERROR_XWIKI_ACCESS_DENIED,
@@ -1177,6 +1179,11 @@
         }
     }
 
+    private void saveDocument() throws XWikiException {
+        context.getWiki().saveDocument(getDoc(), olddoc, context);
+        olddoc = doc;
+    }
+
     public com.xpn.xwiki.api.Object addObjectFromRequest() throws XWikiException {
         // Call to getDoc() ensures that we are working on a clone()
         return new com.xpn.xwiki.api.Object(getDoc().addObjectFromRequest(context), context);