cvs commit: jahia/src/java/org/jahia/operations OperationManager.java

[Cedric Mailleux]

cmailleux    2005/03/31 18:35:56 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/operations OperationManager.java 
  Log:
  Test if the user is present (no in case of logout)
  
  Revision      Changes    Path
  1.34.2.2.2.5  +11 -9     
jahia/src/java/org/jahia/operations/OperationManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/operations/OperationManager.java.diff?r1=1.34.2.2.2.4&r2=1.34.2.2.2.5&f=h
  
  
  
  Index: OperationManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/operations/Attic/OperationManager.java,v
  retrieving revision 1.34.2.2.2.4
  retrieving revision 1.34.2.2.2.5
  diff -u -r1.34.2.2.2.4 -r1.34.2.2.2.5
  --- OperationManager.java     30 Mar 2005 09:54:22 -0000      1.34.2.2.2.4
  +++ OperationManager.java     31 Mar 2005 16:35:55 -0000      1.34.2.2.2.5
  @@ -455,15 +455,17 @@
               generatedPage.put(entryKey,entryKey);
           } else {
               logger.debug("Bypassing HTML cache storage");
  -            String entryKey = htmlCache.computeEntryKey (
  -                    Integer.toString (jParams.getPageID ()),
  -                    jParams.getUser ().getUsername (),
  -                    languageCode,
  -                    workflowState,
  -                    jParams.getUserAgent ());
  -            generatingPage.remove(entryKey);
  -            if(jParams.getCacheExpirationDelay()==0)
  -            notCacheablePage.put(entryKey,entryKey);
  +            if (htmlCache != null && jParams.getUser() != null) {
  +                String entryKey = 
htmlCache.computeEntryKey(Integer.toString(jParams.getPageID()),
  +                                                            
jParams.getUser().getUsername(),
  +                                                            languageCode,
  +                                                            workflowState,
  +                                                            
jParams.getUserAgent());
  +                generatingPage.remove(entryKey);
  +                if (jParams.getCacheExpirationDelay() == 0) {
  +                    notCacheablePage.put(entryKey, entryKey);
  +                }
  +            }
           }
       }