xlawrence 2005/12/15 16:01:19 CET
Modified files:
core/src/java/org/jahia/engines/validation
EngineValidationHelper.java
Log:
JAHIA-585
added checks to avoid NPE
Revision Changes Path
1.6 +8 -4
jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java.diff?r1=1.5&r2=1.6&f=h
Index: EngineValidationHelper.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EngineValidationHelper.java 28 Nov 2005 15:50:56 -0000 1.5
+++ EngineValidationHelper.java 15 Dec 2005 15:01:18 -0000 1.6
@@ -46,6 +46,7 @@
import org.apache.commons.validator.ValidatorResources;
import org.apache.struts.validator.Resources;
import org.jahia.data.containers.JahiaContainer;
+import org.jahia.data.containers.JahiaContainerDefinition;
import org.jahia.data.fields.JahiaField;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
@@ -120,10 +121,13 @@
public static boolean isFieldMandatory(final JahiaContainer
parentContainer,
final JahiaField theField,
final ProcessingContext jParams)
throws JahiaException {
- final String containerBeanName =
-
parentContainer.getDefinition().getProperty("containerBeanName");
- final String validatorKey =
- parentContainer.getDefinition().getProperty("validatorKey");
+ if (parentContainer == null || theField == null) return false;
+
+ final JahiaContainerDefinition def = parentContainer.getDefinition();
+ if (def == null) return false;
+
+ final String containerBeanName =
def.getProperty("containerBeanName");
+ final String validatorKey = def.getProperty("validatorKey");
logger.debug("containerBeanName: " + containerBeanName +
", validatorKey: " + validatorKey);
