Author: mvdb
Date: Sat Jun 30 02:26:22 2007
New Revision: 552123

URL: http://svn.apache.org/viewvc?view=rev&rev=552123
Log:
Fix BETWIXT-58. Thanx to Kevin Waugh for spotting this.

Modified:
    
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ConvertUtilsObjectStringConverter.java
    
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java

Modified: 
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ConvertUtilsObjectStringConverter.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ConvertUtilsObjectStringConverter.java?view=diff&rev=552123&r1=552122&r2=552123
==============================================================================
--- 
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ConvertUtilsObjectStringConverter.java
 (original)
+++ 
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/strategy/ConvertUtilsObjectStringConverter.java
 Sat Jun 30 02:26:22 2007
@@ -94,7 +94,7 @@
     public Object stringToObject(String value, Class type, String flavour, 
Context context) {
         if (value == null || "".equals(value))
         {
-            return null;    
+            return "";    
         }
         
         return ConvertUtils.convert( value, type );

Modified: 
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java?view=diff&rev=552123&r1=552122&r2=552123
==============================================================================
--- 
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java
 (original)
+++ 
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/strategy/TestObjectStringConverters.java
 Sat Jun 30 02:26:22 2007
@@ -67,6 +67,15 @@
         commonTestForConvertUtilsConverters( converter );
     }
     
+    /**
+     * Testcase added for BETWIXT-58
+     * @throws Exception
+     */
+    public void testConvertUtilsObjectStringConverter() throws Exception {
+        ConvertUtilsObjectStringConverter converter = new 
ConvertUtilsObjectStringConverter();
+        assertEquals("", converter.stringToObject(null,null, null, null));
+    }
+    
     private void commonTestForConvertUtilsConverters(ObjectStringConverter 
objectStringConverter) {
         Converter converter = new Converter() {
             public Object convert(Class type, Object value) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to