cvs commit: jahia/src/java/org/jahia/services/version UndoStagingContentTreeVisitor.java

[Khue Nguyen]

knguyen     2004/10/01 18:55:57 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/version 
                                        UndoStagingContentTreeVisitor.java 
  Log:
  - page that exists only in staging undo issue
  
  Revision  Changes    Path
  1.5.2.5   +3 -10     
jahia/src/java/org/jahia/services/version/UndoStagingContentTreeVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/version/UndoStagingContentTreeVisitor.java.diff?r1=1.5.2.4&r2=1.5.2.5&f=h
  
  
  
  Index: UndoStagingContentTreeVisitor.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/version/Attic/UndoStagingContentTreeVisitor.java,v
  retrieving revision 1.5.2.4
  retrieving revision 1.5.2.5
  diff -u -r1.5.2.4 -r1.5.2.5
  --- UndoStagingContentTreeVisitor.java        28 Sep 2004 09:28:19 -0000      1.5.2.4
  +++ UndoStagingContentTreeVisitor.java        1 Oct 2004 16:55:56 -0000       1.5.2.5
  @@ -212,6 +212,8 @@
           }
   
           if ( page == null ){
  +            // if the page doesn't exist, we just undo this field
  +            contentObject.undoStaging(this.jParams);
               return;
           }
   
  @@ -371,19 +373,10 @@
           if ( rootContentObject == null ){
               return;
           }
  -
  -        ContentPage contentPage = null;
  -        try {
  -            contentPage = ContentPage.getPage(pageId);
  -        } catch ( Throwable t ){
  -        }
  -        if ( contentPage == null ){
  -            return;
  -        }
           UndoStagingContentTreeVisitor undoSV =
               new UndoStagingContentTreeVisitor(rootContentObject,
               getUser(), getEntryLoadRequest(), getOperationMode(),
  -            jParams, contentPage.getID());
  +            jParams, pageId);
           undoSV.undoStaging();
       }