cvs commit: jahia/core/src/java/org/jahia/content ContentMetadataFacade.java ContentObject.java

[Benjamin Papez]

bpapez      2005/12/06 13:12:59 CET

  Modified files:
    core/src/java/org/jahia/content ContentMetadataFacade.java 
                                    ContentObject.java 
  Log:
  log thrown exceptions as warnings
  
  Revision  Changes    Path
  1.13      +1 -0      
jahia/core/src/java/org/jahia/content/ContentMetadataFacade.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentMetadataFacade.java.diff?r1=1.12&r2=1.13&f=h
  1.29      +31 -5     jahia/core/src/java/org/jahia/content/ContentObject.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ContentObject.java.diff?r1=1.28&r2=1.29&f=h
  
  
  
  Index: ContentObject.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ContentObject.java        17 Nov 2005 13:42:04 -0000      1.28
  +++ ContentObject.java        6 Dec 2005 12:12:58 -0000       1.29
  @@ -1298,15 +1298,25 @@
        *
        * @return a JahiaObject
        */
  -    public ContentField getMetadata(String name) throws JahiaException {
  +    public ContentField getMetadata(String name) throws JahiaException {    
  +        return getMetadata(name, false);
  +    }
  +    
  +    /**
  +     * Return the ContentField metadata with this one and having the given 
name.
  +     * @see StructuralRelationship.METADATA_LINK
  +     *
  +     * @return a JahiaObject
  +     */
  +    public ContentField getMetadata(String name, boolean forceLoadFromDB) 
throws JahiaException {
           Integer id = 
jahiaFieldsDataManager.findMetadataByOwnerAndName(name,this.getObjectKey());
           if ( id == null ){
               return null;
           }
           try {
  -            return ContentField.getField(id.intValue());
  +            return ContentField.getField(id.intValue(), forceLoadFromDB);
           } catch (Throwable t) {
  -            logger.debug(t);
  +            logger.warn(t);
           }
           return null;
       }
  @@ -1322,8 +1332,24 @@
       public JahiaField getMetadataAsJahiaField(String name,
                                                 ProcessingContext jParams)
       throws JahiaException {
  +        return getMetadataAsJahiaField(name, jParams, false); 
  +    }    
  +    
  +    /**
  +     * Returns the metadata as a JahiaField instance
  +     *
  +     * @param name the metadata name
  +     * @param jParams
  +     * @param forceLoadFromDB 
  +     * @return
  +     * @throws JahiaException
  +     */
  +    public JahiaField getMetadataAsJahiaField(String name,
  +                                              ProcessingContext jParams,
  +                                              boolean forceLoadFromDB)
  +    throws JahiaException {
   
  -        ContentField contentField = this.getMetadata(name);
  +        ContentField contentField = this.getMetadata(name, forceLoadFromDB);
           if ( contentField == null ){
               return null;
           }
  @@ -1392,7 +1418,7 @@
           if ( value == null ){
               return false;
           }
  -        JahiaField jahiaField = getMetadataAsJahiaField(name,jParams);
  +        JahiaField jahiaField = getMetadataAsJahiaField(name,jParams, true);
           if ( jahiaField == null ){
               return false;
           }
  
  
  
  Index: ContentMetadataFacade.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentMetadataFacade.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ContentMetadataFacade.java        5 Dec 2005 10:44:46 -0000       1.12
  +++ ContentMetadataFacade.java        6 Dec 2005 12:12:58 -0000       1.13
  @@ -722,6 +722,7 @@
           try {
               return 
ContentObject.getContentObjectInstance(this.getObjectKey());
           } catch ( Throwable t){
  +            logger.debug("Cannot get content object", t);
           }
           return null;
       }