commit c75ed26941b292b7adb3f0c208904ad5e00bce58
author Leonardo Uribe <lu4242@apache.org> Sat May 29 01:15:13 2010 +0000
committer Leonardo Uribe <lu4242@apache.org> Sat May 29 01:15:13 2010 +0000
tree ae8d598d75a8844aab758b4951c3ac4691992c4b
parent c2f7f09785fd8bdaba1b3984335db0de44f082a3

when object is null return null

test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java

diff --git a/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java b/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
index a86d7b3..350848e 100644
--- a/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
+++ b/test12/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
@@ -123,6 +123,10 @@
         if ((object != null) && targetType.isAssignableFrom(object.getClass())) {
             return object;
         }
+        
+        // new to spec
+        if (object == null)
+            return null;
 
         // We do not know how to perform this conversion
         throw new IllegalArgumentException("Cannot convert " + object + " to " + targetType.getName());