svn commit: r917374 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java

[doogie-3]

Author: doogie
Date: Mon Mar  1 05:05:43 2010
New Revision: 917374

URL: http://svn.apache.org/viewvc?rev=917374&view=rev
Log:
BUG FIX: When the target type is Object, return the passed value.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java?rev=917374&r1=917373&r2=917374&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ObjectType.java Mon Mar  1 05:05:43 2010
@@ -484,6 +484,9 @@
             return obj.toString();
         }
         Class<?> sourceClass = obj.getClass();
+        if ("Object".equals(type) || "java.lang.Object".equals(type)) {
+            return obj;
+        }
         if (obj instanceof String && UtilValidate.isEmpty(obj)) {
             return null;
         }