shuber      2005/06/09 17:00:28 CEST

  Modified files:
    src/view/jsp         eventlistener.jsp 
  Log:
  Add check for field existence in beforeFieldActivation listener. getField can 
return null if the field has been marked for deletion !
  
  Revision  Changes    Path
  1.7       +15 -11    corporate_portal_templates/src/view/jsp/eventlistener.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/eventlistener.jsp.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: eventlistener.jsp
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/eventlistener.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- eventlistener.jsp 8 Jun 2005 07:43:08 -0000       1.6
  +++ eventlistener.jsp 9 Jun 2005 15:00:28 -0000       1.7
  @@ -1,4 +1,4 @@
  -<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
   <%@ page import="java.util.*" %>
   <%@ page import="org.jahia.content.*" %>
   <%@ page import="org.jahia.data.*" %>
  @@ -538,20 +538,24 @@
       // Last activation Date Field
       if ( "metaDataPublishingDate".equals(fieldDef.getName()) ){
           JahiaField theField = 
contentField.getJahiaField(jParams.getEntryLoadRequest());
  -        theField.setObject(String.valueOf(saveVersion.getVersionID()*1000L));
  -        theField.save(jParams);
  -
  -        // reload the contentField
  -        contentField = ContentField.getField(theField.getID());
  +        // the field could be null in case it was marked for deletion !
  +     if (theField != null) {
  +            
theField.setObject(String.valueOf(saveVersion.getVersionID()*1000L));
  +            theField.save(jParams);
  +            // reload the contentField
  +            contentField = ContentField.getField(theField.getID());
  +        }
       }
   
       // Publisher Field
       if ( "metaDataPublisher".equals(fieldDef.getName()) ){
           JahiaField theField = 
contentField.getJahiaField(jParams.getEntryLoadRequest());
  -        theField.setValue(jParams.getUser().getUsername());
  -        theField.save(jParams);
  -
  -        // reload the contentField
  -        contentField = ContentField.getField(theField.getID());
  +        // the field could be null in case it was marked for deletion !
  +     if (theField != null) {
  +            theField.setValue(jParams.getUser().getUsername());
  +            theField.save(jParams);
  +            // reload the contentField
  +            contentField = ContentField.getField(theField.getID());
  +        }
       }
   }%>
  

Reply via email to