Author: indika
Date: Mon Oct 27 08:29:17 2008
New Revision: 708220
URL: http://svn.apache.org/viewvc?rev=708220&view=rev
Log:
Appling Senaka's patch for SYNAPSE-426
Thanks Senaka
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java?rev=708220&r1=708219&r2=708220&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
Mon Oct 27 08:29:17 2008
@@ -67,7 +67,7 @@
}
if (trigger == null) {
- throw new NullPointerException("Trigger is null for the Task
description : " + taskDescription);
+ throw new SynapseTaskException("Trigger is null for the Task
description : " + taskDescription);
}
if (startTime != null) {
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java?rev=708220&r1=708219&r2=708220&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
Mon Oct 27 08:29:17 2008
@@ -64,7 +64,7 @@
* Explicit check for determine whether there is a task description with a
name in interest
*
* @param name Name of the TaskDescription
- * @return Retunrs true , if there is no TaskDescription associated with
given name , otherwise , false
+ * @return Returns true , if there is no TaskDescription associated with
given name , otherwise , false
*/
public boolean isUnique(String name) {
validateName(name);
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java?rev=708220&r1=708219&r2=708220&view=diff
==============================================================================
---
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
(original)
+++
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/util/PropertyHelper.java
Mon Oct 27 08:29:17 2008
@@ -58,51 +58,52 @@
Class[] params = method1.getParameterTypes();
if (params.length != 1) {
handleException("Did not find a setter method named :
" + mName +
- "() that takes a single String, int,
long, float, double " +
- "or boolean parameter");
+ "() that takes a single String, int, long,
float, double ,OMElement " +
+ "or boolean parameter");
} else if (val instanceof String) {
String value = (String) val;
- if (params[0].equals(String.class)) {
+ if (String.class.equals(params[0])) {
method = obj.getClass().getMethod(mName,
String.class);
method.invoke(obj, new String[]{value});
- } else if (params[0].equals(int.class)) {
- } else if (params[0].equals(long.class)) {
+ } else if (int.class.equals(params[0])) {
+ method = obj.getClass().getMethod(mName,
int.class);
+ method.invoke(obj, new Integer[]{new
Integer(value)});
+ } else if (long.class.equals(params[0])) {
method = obj.getClass().getMethod(mName,
long.class);
method.invoke(obj, new Long[]{new Long(value)});
- } else if (params[0].equals(float.class)) {
+ } else if (float.class.equals(params[0])) {
method = obj.getClass().getMethod(mName,
float.class);
method.invoke(obj, new Float[]{new Float(value)});
- } else if (params[0].equals(double.class)) {
+ } else if (double.class.equals(params[0])) {
method = obj.getClass().getMethod(mName,
double.class);
method.invoke(obj, new Double[]{new
Double(value)});
- } else if (params[0].equals(boolean.class)) {
+ } else if (boolean.class.equals(params[0])) {
method = obj.getClass().getMethod(mName,
boolean.class);
method.invoke(obj, new
Boolean[]{Boolean.valueOf(value)});
} else {
- handleException("Did not find a setter method
named : " + mName +
- "() that takes a single String,
int, long, float, double " +
- "or boolean parameter");
+ continue;
}
+ } else if (val instanceof OMElement &&
OMElement.class.equals(params[0])) {
+ method = obj.getClass().getMethod(mName,
OMElement.class);
+ method.invoke(obj, new OMElement[]{(OMElement) val});
} else {
- if (params[0].equals(OMElement.class)) {
- method = obj.getClass().getMethod(mName,
OMElement.class);
- method.invoke(obj, new OMElement[]{(OMElement)
val});
- }
+ continue;
}
invoked = true;
+ break;
}
}
if (!invoked) {
handleException("Did not find a setter method named : " +
mName +
- "() that takes a single String, int, long, float, double "
+
- "or boolean parameter");
+ "() that takes a single String, int, long, float,
double " +
+ "or boolean parameter");
}
} catch (Exception e) {
handleException("Error invoking setter method named : " + mName +
- "() that takes a single String, int, long, float, double " +
- "or boolean parameter", e);
+ "() that takes a single String, int, long, float, double "
+
+ "or boolean parameter", e);
}
}
