cvs commit: jahia/core/src/java/org/jahia/taglibs/categories CategoryTag.java

[Serge Huber]

shuber      2005/06/02 17:49:32 CEST

  Modified files:
    core/src/java/org/jahia/taglibs/categories CategoryTag.java 
  Log:
  Fix missing null check in cateogry tag selected category name
  
  Revision  Changes    Path
  1.5       +6 -2      
jahia/core/src/java/org/jahia/taglibs/categories/CategoryTag.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/taglibs/categories/CategoryTag.java.diff?r1=1.4&r2=1.5&f=h
  
  
  
  Index: CategoryTag.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/taglibs/categories/CategoryTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CategoryTag.java  21 Apr 2005 09:00:45 -0000      1.4
  +++ CategoryTag.java  2 Jun 2005 15:49:32 -0000       1.5
  @@ -274,8 +274,12 @@
           }
   
           // now let's handle default selection of a category.
  -        String selectedCategoryKey = (String) pageContext.findAttribute(
  -            selectedCategoryKeyName);
  +        String selectedCategoryKey = null;
  +
  +        if (selectedCategoryKeyName != null) {
  +            selectedCategoryKey = (String) pageContext.findAttribute(
  +                selectedCategoryKeyName);
  +        }
           if (selectedCategoryKey != null) {
               if (tree.getSelectionCount() != 0) {
                   tree.clearSelection();