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

[Thomas Draier]

tdraier     2005/11/15 12:57:09 CET

  Modified files:
    core/src/java/org/jahia/content ContentObject.java 
  Log:
  fix - only jahiafields can be metadata
  
  Revision  Changes    Path
  1.27      +3 -0      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.26&r2=1.27&f=h
  
  
  
  Index: ContentObject.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ContentObject.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ContentObject.java        10 Nov 2005 10:31:35 -0000      1.26
  +++ ContentObject.java        15 Nov 2005 11:57:09 -0000      1.27
  @@ -1445,6 +1445,9 @@
        * @return the contentObject owner of the metadata
        */
       public static ContentObject getContentObjectFromMetadata(ObjectKey 
metadataObjectKey) {
  +        if (!ContentFieldKey.FIELD_TYPE.equals(metadataObjectKey.getType())) 
{
  +            return null;
  +        }
           return jahiaFieldsDataManager.findJahiaObjectByMetadata(
                   new Integer(metadataObjectKey.getIdInType()));
       }