[xwiki-notifications] r7863 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web

[SVN]

Author: sdumitriu
Date: 2008-02-20 02:52:07 +0100 (Wed, 20 Feb 2008)
New Revision: 7863

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/LockAction.java
Log:
XWIKI-1750: Edit locking and unlocking might halt page loading
Fixed.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
      2008-02-20 01:47:34 UTC (rev 7862)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/CancelAction.java
      2008-02-20 01:52:07 UTC (rev 7863)
@@ -20,6 +20,8 @@
  */
 package com.xpn.xwiki.web;
 
+import org.apache.commons.lang.BooleanUtils;
+
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
 import com.xpn.xwiki.doc.XWikiDocument;
@@ -65,8 +67,10 @@
         }
 
         // forward to view
-        String ajax = request.getParameter("ajax");
-        if (ajax == null || !ajax.equals("1")) {
+        if (BooleanUtils.isTrue((Boolean) context.get("ajax"))) {
+            response.setStatus(204);
+            response.setContentLength(0);
+        } else {
             String redirect = Utils.getRedirect("view", context);
             sendRedirect(response, redirect);
         }

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/LockAction.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/LockAction.java
        2008-02-20 01:47:34 UTC (rev 7862)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/LockAction.java
        2008-02-20 01:52:07 UTC (rev 7863)
@@ -1,5 +1,7 @@
 package com.xpn.xwiki.web;
 
+import org.apache.commons.lang.BooleanUtils;
+
 import com.xpn.xwiki.XWiki;
 import com.xpn.xwiki.XWikiContext;
 import com.xpn.xwiki.XWikiException;
@@ -44,8 +46,10 @@
         }
 
         // forward to view
-        String ajax = request.getParameter("ajax");
-        if (ajax == null || !ajax.equals("1")) {
+        if (BooleanUtils.isTrue((Boolean) context.get("ajax"))) {
+            response.setStatus(204);
+            response.setContentLength(0);
+        } else {
             String redirect = Utils.getRedirect("view", context);
             sendRedirect(response, redirect);
         }

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