cvs commit: jahia/core/src/java/org/jahia/services/homepages JahiaHomepageLink.java

[Cedric Mailleux]

cmailleux    2005/11/02 15:13:29 CET

  Modified files:
    core/src/java/org/jahia/services/homepages 
                                               JahiaHomepageLink.java 
  Log:
  Correctly handle pageID properties
  
  Revision  Changes    Path
  1.3       +11 -4     
jahia/core/src/java/org/jahia/services/homepages/JahiaHomepageLink.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/homepages/JahiaHomepageLink.java.diff?r1=1.2&r2=1.3&f=h
  
  
  
  Index: JahiaHomepageLink.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/homepages/JahiaHomepageLink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JahiaHomepageLink.java    22 Jun 2005 12:33:15 -0000      1.2
  +++ JahiaHomepageLink.java    2 Nov 2005 14:13:29 -0000       1.3
  @@ -68,10 +68,17 @@
        * @return int the internal page id or -1 if not defined.
        */
       public int getPageID(){
  -     Integer pageID = (Integer)props.get(PAGEID);
  -     if ( pageID == null ){
  -             return -1;
  -     }
  +        Object o = props.get(PAGEID);
  +        Integer pageID;
  +        if (o instanceof String) {
  +            pageID = new Integer((String) o);
  +        } else {
  +            pageID = (Integer) o;
  +        }
  +
  +        if ( pageID == null ){
  +            return -1;
  +        }
        return pageID.intValue();
        }