X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionParameterPostProcessor.java;h=2ba426e13ebd1fe0f411378c9a2941af5611cf1c;hb=bfb5bb54702d2e706ab7a8b0bc4af94eada6e01c;hp=5b28534ba43063ceedf61849c9a1f836ecc5ef17;hpb=08aa02f96eb32a6e1f0cc001113df9311a618eb9;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
index 5b28534ba..2ba426e13 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution;
 
 import java.beans.PropertyDescriptor;
@@ -86,7 +102,6 @@ public class ExecutionParameterPostProcessor extends
 					placeholder).toString();
 
 		else {// execution
-			log.debug("Bean class: " + bean.getClass());
 			// next call fail if no execution context available
 			Object obj = executionContext.getVariable(placeholder);
 			if (obj != null) {
@@ -104,11 +119,15 @@ public class ExecutionParameterPostProcessor extends
 			String originalValue = tsv.getValue();
 
 			String convertedValue = resolveString(beanName, bean, originalValue);
+			if (convertedValue == null)
+				return null;
 			return convertedValue.equals(originalValue) ? value
 					: new TypedStringValue(convertedValue);
 		} else if (value instanceof String) {
 			String originalValue = value.toString();
 			String convertedValue = resolveString(beanName, bean, originalValue);
+			if (convertedValue == null)
+				return null;
 			return convertedValue.equals(originalValue) ? value
 					: convertedValue;
 		} else if (value instanceof ManagedMap) {
@@ -159,13 +178,17 @@ public class ExecutionParameterPostProcessor extends
 			}
 			return entriesModified ? newContent : value;
 		} else {
-			//log.debug(beanName + ": " + value.getClass() + " : " + value);
+			// log.debug(beanName + ": " + value.getClass() + " : " + value);
 			return value;
 		}
 
 	}
 
 	private String resolveString(String beanName, Object bean, String strVal) {
+		// in case <null/> is passed
+		if (strVal == null)
+			return null;
+
 		String value = parseStringValue(bean, strVal, new HashSet<String>());
 
 		if (value == null)
@@ -205,6 +228,10 @@ public class ExecutionParameterPostProcessor extends
 			Set<String> visitedPlaceholders)
 			throws BeanDefinitionStoreException {
 
+		// in case <null/> is passed
+		if (strVal == null)
+			return null;
+
 		StringBuffer buf = new StringBuffer(strVal);
 
 		int startIndex = strVal.indexOf(placeholderPrefix);