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

[Thomas Draier]

tdraier     2004/10/22 17:33:20 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/webdav UsageEntry.java 
  Log:
  fixed npe in usagentry
  
  Revision  Changes    Path
  1.9.4.2   +15 -13    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.1&r2=1.9.4.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.1
  retrieving revision 1.9.4.2
  diff -u -r1.9.4.1 -r1.9.4.2
  --- UsageEntry.java   23 Jun 2004 14:14:42 -0000      1.9.4.1
  +++ UsageEntry.java   22 Oct 2004 15:33:19 -0000      1.9.4.2
  @@ -56,20 +56,22 @@
   //                    && !contentField.hasStagingEntry(lang) ) );
                   aPage = sReg.getJahiaPageService ()
                           .lookupPage (aField.getPageID (), loadRequest);
  -                if ((workflow == EntryLoadRequest.STAGING_WORKFLOW_STATE)
  -                        || (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) {
  +                    if ((workflow == EntryLoadRequest.STAGING_WORKFLOW_STATE)
  +                            || (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);
  +                        }
  +                        url = aPage.getURL (jParams);
  +                        jParams.setOperationMode (opMode);
                       }
  -                    url = aPage.getURL (jParams);
  -                    jParams.setOperationMode (opMode);
                   }
               }
           }