pnever      2005/02/25 07:57:27

  Modified:    src/share/org/apache/slide/content Tag:
                        SLIDE_2_1_RELEASE_BRANCH ContentImpl.java
  Log:
  Minor change
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.60.2.2  +9 -7      
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
  
  Index: ContentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
  retrieving revision 1.60.2.1
  retrieving revision 1.60.2.2
  diff -u -r1.60.2.1 -r1.60.2.2
  --- ContentImpl.java  23 Feb 2005 16:33:30 -0000      1.60.2.1
  +++ ContentImpl.java  25 Feb 2005 15:57:26 -0000      1.60.2.2
  @@ -415,9 +415,7 @@
           ServiceAccessException, ObjectLockedException, VetoException {
           
           // Check parent exists and is not lock-null
  -        SlideTokenWrapper readOnlyToken = new SlideTokenWrapper(token);
  -        readOnlyToken.setForceStoreEnlistment(false);
  -        checkParentExists(strUri, readOnlyToken);
  +        checkParentExists(strUri, token);
           
           // Retrieve the associated object
           ObjectNode associatedObject =
  @@ -1477,6 +1475,10 @@
           throws ServiceAccessException, ObjectLockedException, 
AccessDeniedException,
           LinkedObjectNotFoundException, ObjectNotFoundException, 
VetoException {
           
  +        // do it with a read-only token
  +        token = new SlideTokenWrapper(token);
  +        token.setForceStoreEnlistment(false);
  +        
           if 
(namespaceConfig.getCreateObjectAction().equals(ActionNode.DEFAULT)) {
               // do not check during start-up
               return;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to