cvs commit: jahia/core/src/java/org/jahia/hibernate/manager JahiaContainerManager.java

[Cedric Mailleux]

cmailleux    2005/12/02 12:23:33 CET

  Modified files:
    core/src/java/org/jahia/hibernate/manager 
                                              JahiaContainerManager.java 
  Log:
  Avoid npe when container not found
  
  Revision  Changes    Path
  1.20      +8 -1      
jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java.diff?r1=1.19&r2=1.20&f=h
  
  
  
  Index: JahiaContainerManager.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/manager/JahiaContainerManager.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JahiaContainerManager.java        24 Nov 2005 16:11:48 -0000      1.19
  +++ JahiaContainerManager.java        2 Dec 2005 11:23:33 -0000       1.20
  @@ -604,7 +604,14 @@
       }
   
       public Map getProperties(int containerID) {
  -        return dao.loadContainer(new Integer(containerID)).getProperties();
  +        org.jahia.hibernate.model.JahiaContainer jahiaContainer = 
dao.loadContainer(new Integer(containerID));
  +        Map properties = null;
  +        if(jahiaContainer!=null) {
  +            properties = jahiaContainer.getProperties();
  +        } else {
  +            properties = new HashMap();
  +        }
  +        return properties;
       }
   
       public void setProperties(int containerID, int jahiaID, Map 
containerProperties) {