svn commit: r567439 - /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java

Author: andreas
Date: Sun Aug 19 10:29:37 2007
New Revision: 567439

URL: http://svn.apache.org/viewvc?view=rev&rev=567439
Log:
Avoid exception in ForceCheckIn.prepareView()

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java?view=diff&rev=567439&r1=567438&r2=567439
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java Sun Aug 19 10:29:37 2007
@@ -57,13 +57,15 @@
 
     protected void prepareView() throws Exception {
         Node node = getSourceDocument().getRepositoryNode();
-        String userId = node.getCheckoutUserId();
-        String[] params = { userId };
-        if (isLoggedIn(userId)) {
-            addInfoMessage("user-logged-in", params);
-        }
-        else {
-            addInfoMessage("user-not-logged-in", params);
+        if (node.isCheckedOut()) {
+            String userId = node.getCheckoutUserId();
+            String[] params = { userId };
+            if (isLoggedIn(userId)) {
+                addInfoMessage("user-logged-in", params);
+            }
+            else {
+                addInfoMessage("user-not-logged-in", params);
+            }
         }
     }