cvs commit: jahia/src/java/org/jahia/services/webdav UsageEntry.java

[Thomas Draier]

tdraier     2005/06/10 14:54:47 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/services/webdav UsageEntry.java 
  Log:
  avoid npe
  
  Revision     Changes    Path
  1.9.4.2.2.2  +11 -9     
jahia/src/java/org/jahia/services/webdav/UsageEntry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/UsageEntry.java.diff?r1=1.9.4.2.2.1&r2=1.9.4.2.2.2&f=h
  
  
  
  Index: UsageEntry.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/UsageEntry.java,v
  retrieving revision 1.9.4.2.2.1
  retrieving revision 1.9.4.2.2.2
  diff -u -r1.9.4.2.2.1 -r1.9.4.2.2.2
  --- UsageEntry.java   25 Mar 2005 15:12:12 -0000      1.9.4.2.2.1
  +++ UsageEntry.java   10 Jun 2005 12:54:47 -0000      1.9.4.2.2.2
  @@ -60,16 +60,18 @@
                           || (workflow == 
EntryLoadRequest.ACTIVE_WORKFLOW_STATE)
                           || (workflow == 
EntryLoadRequest.WAITING_WORKFLOW_STATE)) {
   
  -                    String opMode = jParams.getOperationMode ();
  -                    if (workflow == EntryLoadRequest.STAGING_WORKFLOW_STATE) 
{
  -                        jParams.setOperationMode (ParamBean.EDIT);
  -                    } else if (workflow == 
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
  -                        jParams.setOperationMode (ParamBean.NORMAL);
  -                    } else if (workflow == 
EntryLoadRequest.WAITING_WORKFLOW_STATE) {
  -                        jParams.setOperationMode (ParamBean.PREVIEW);
  +                    if (aPage != null) {
  +                        String opMode = jParams.getOperationMode ();
  +                        if (workflow == 
EntryLoadRequest.STAGING_WORKFLOW_STATE) {
  +                            jParams.setOperationMode (ParamBean.EDIT);
  +                        } else if (workflow == 
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
  +                            jParams.setOperationMode (ParamBean.NORMAL);
  +                        } else if (workflow == 
EntryLoadRequest.WAITING_WORKFLOW_STATE) {
  +                            jParams.setOperationMode (ParamBean.PREVIEW);
  +                        }
  +                        url = aPage.getURL (jParams);
  +                        jParams.setOperationMode (opMode);
                       }
  -                    url = aPage.getURL (jParams);
  -                    jParams.setOperationMode (opMode);
                   }
               }
           }