You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/05/03 17:30:11 UTC
svn commit: r534909 - in
/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting:
ReservedCheckinAction.java ReservedCheckoutAction.java
Author: andreas
Date: Thu May 3 08:30:10 2007
New Revision: 534909
URL: http://svn.apache.org/viewvc?view=rev&rev=534909
Log:
Added checks to ReservedCheck*Actions to avoid duplicate checkin/checkout.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java?view=diff&rev=534909&r1=534908&r2=534909
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckinAction.java Thu May 3 08:30:10 2007
@@ -27,6 +27,7 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.rc.FileReservedCheckInException;
+import org.apache.lenya.cms.repository.Node;
/**
* Checkin document
@@ -51,7 +52,10 @@
getLogger().debug("Backup: " + backup);
try {
- getRc().reservedCheckIn(getNode(), getUsername(), backup, true);
+ Node node = getNode();
+ if (node.isCheckedOutByUser()) {
+ getRc().reservedCheckIn(node, getUsername(), backup, true);
+ }
} catch (FileReservedCheckInException e) {
actionMap.put("exception", "fileReservedCheckInException");
actionMap.put("filename", getNode().getSourceURI());
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java?view=diff&rev=534909&r1=534908&r2=534909
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/ReservedCheckoutAction.java Thu May 3 08:30:10 2007
@@ -27,6 +27,7 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.lenya.cms.rc.FileReservedCheckOutException;
+import org.apache.lenya.cms.repository.Node;
/**
* Action doing reserved checkout
@@ -44,8 +45,12 @@
//check out
try {
- getLogger().debug(".act(): Node: " + getNode().getSourceURI());
- getLogger().debug(".act(): Username: " + getUsername());
+
+ Node node = getNode();
+ String username = getUsername();
+
+ getLogger().debug(".act(): Node: " + node.getSourceURI());
+ getLogger().debug(".act(): Username: " + username);
if (getNode() == null) {
throw new Exception("Filename is null");
@@ -54,8 +59,10 @@
if (getUsername() == null) {
throw new Exception("Username is null");
}
-
- getRc().reservedCheckOut(getNode(), getUsername());
+
+ if (!node.isCheckedOutByUser()) {
+ getRc().reservedCheckOut(node, username);
+ }
} catch (FileReservedCheckOutException e) {
actionMap.put("exception", "fileReservedCheckOutException");
actionMap.put("filename", getNode().getSourceURI());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org