cvs commit: jahia/src/java/org/jahia/content/comparators ContainerRankingComparator.java

[Serge Huber]

shuber      2004/09/29 16:23:21 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/content/comparators 
                                           ContainerRankingComparator.java 
  Log:
  Fix NullPointerException in container comparison if for example we are not allowed 
to display a container.
  
  Revision  Changes    Path
  1.1.4.1   +9 -1      
jahia/src/java/org/jahia/content/comparators/ContainerRankingComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/content/comparators/ContainerRankingComparator.java.diff?r1=1.1&r2=1.1.4.1&f=h
  
  
  
  Index: ContainerRankingComparator.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/content/comparators/Attic/ContainerRankingComparator.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- ContainerRankingComparator.java   12 Aug 2003 17:43:48 -0000      1.1
  +++ ContainerRankingComparator.java   29 Sep 2004 14:23:21 -0000      1.1.4.1
  @@ -36,6 +36,14 @@
               JahiaContainer rightJahiaContainer = rightContainer.
                                                    getJahiaContainer(paramBean,
                   paramBean.getEntryLoadRequest());
  +            if (leftJahiaContainer == null) {
  +                logger.warn("Left JahiaContainer in comparison is null");
  +                return -1;
  +            }
  +            if (rightJahiaContainer == null) {
  +                logger.warn("Right JahiaContainer in comparison is null");
  +                return 1;
  +            }
               return new Integer(leftJahiaContainer.getRank()).compareTo(new 
Integer(rightJahiaContainer.getRank()));
           } catch (JahiaException je) {
               logger.error("Error while accessing Jahia containers for entry load 
request " + paramBean.getEntryLoadRequest(), je);
  @@ -51,4 +59,4 @@
           }
       }
   
  -}
  \ No newline at end of file
  +}