[Bedework-commit] indexer r45 - releases/bedework-3.6/src/org/bedework/indexer

[svnadmin at bedework.org]

Author: douglm
Date: 2010-03-05 11:56:39 -0500 (Fri, 05 Mar 2010)
New Revision: 45

Modified:
   releases/bedework-3.6/src/org/bedework/indexer/CalSys.java
Log:
Add a service flag to svci pars to disable setting of last login for background services. The indexer was casusing or suffering from stale state exceptions as it tried to update login.

In any case, it's inappropriate to update login for a background service

Modified: releases/bedework-3.6/src/org/bedework/indexer/CalSys.java
===================================================================
--- releases/bedework-3.6/src/org/bedework/indexer/CalSys.java	2010-03-02 20:39:09 UTC (rev 44)
+++ releases/bedework-3.6/src/org/bedework/indexer/CalSys.java	2010-03-05 16:56:39 UTC (rev 45)
@@ -145,16 +145,9 @@
       curAccount = account;
       curPublicAdmin = publicAdmin;
 
-      CalSvcIPars pars = new CalSvcIPars(account,
-                                         null,
-                                         publicAdmin,
-                                         true,    // Allow super user
-                                         false,  // adminCanEditAllPublicCategories
-                                         false,  // adminCanEditAllPublicLocations
-                                         false,  // adminCanEditAllPublicSponsors
-                                         false,    // sessionless
-                                         null, // synchId
-                                         null); // dbpars
+      CalSvcIPars pars = CalSvcIPars.getServicePars(adminAccount,
+                                                    publicAdmin,
+                                                    true);   // Allow super user
       svci = new CalSvcFactoryDefault().getSvc(pars);
     }
 
@@ -169,16 +162,9 @@
    * @throws CalFacadeException
    */
   public CalSvcI getAdminSvci() throws CalFacadeException {
-    CalSvcIPars pars = new CalSvcIPars(adminAccount,
-                                       null,
-                                       true,   // publicAdmin,
-                                       true,   // Allow super user
-                                       false,  // adminCanEditAllPublicCategories
-                                       false,  // adminCanEditAllPublicLocations
-                                       false,  // adminCanEditAllPublicSponsors
-                                       false,  // sessionless
-                                       null,   // synchId
-                                       null); // dbpars
+    CalSvcIPars pars = CalSvcIPars.getServicePars(adminAccount,
+                                                  true,   // publicAdmin,
+                                                  true);   // Allow super user
     CalSvcI svci = new CalSvcFactoryDefault().getSvc(pars);
 
     svci.open();