--- src/test/com/opensymphony/xwork2/util/XWorkBasicConverterTest.java	(revision 1500)
+++ src/test/com/opensymphony/xwork2/util/XWorkBasicConverterTest.java	Fri May 04 12:09:33 CEST 2007
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2006 by OpenSymphony
+ * Copyright (c) 2002-2007 by OpenSymphony
  * All rights reserved.
  */
 package com.opensymphony.xwork2.util;
@@ -22,15 +22,11 @@
  */
 public class XWorkBasicConverterTest extends TestCase {
 
-    public void test() {
-        // TODO: test for every possible conversion
-        // take into account of empty string
-        // primitive -> conversion error when empty string is passed
-        // object -> return null when empty string is passed
+    // TODO: test for every possible conversion
+    // take into account of empty string
+    // primitive -> conversion error when empty string is passed
+    // object -> return null when empty string is passed
-    }
 
-    // TODO: more test will come soon !!!
-
     public void testDateConversionWithEmptyValue() {
         XWorkBasicConverter basicConverter = new XWorkBasicConverter();
         Object convertedObject = basicConverter.convertValue(new HashMap(), null, null, null, "", Date.class);
@@ -48,6 +44,7 @@
         }
     }
 
+    /* the code below has been disabled as it causes sideffects in Strtus2 (XW-512)
     public void testXW490ConvertStringToDobule() throws Exception {
         Locale locale = new Locale("DA"); // let's use a not common locale such as Denmark
 
@@ -77,4 +74,5 @@
         // output should be formatted according to Danish locale using , as decimal seperator
         assertEquals("123,99", value);
     }
+    */
 }
--- src/java/com/opensymphony/xwork2/util/XWorkBasicConverter.java	(revision 1500)
+++ src/java/com/opensymphony/xwork2/util/XWorkBasicConverter.java	Fri May 04 12:07:44 CEST 2007
@@ -73,14 +73,15 @@
         }
 
         if (toType == String.class) {
-            Class inputType = value.getClass();
+            /* the code below has been disabled as it causes sideffects in Strtus2 (XW-512)
             // if input (value) is a number then use special conversion method (XW-490)
+            Class inputType = value.getClass();
             if (Number.class.isAssignableFrom(inputType)) {
                 result = doConvertFromNumberToString(context, value, inputType);
                 if (result != null) {
                     return result;
                 }
-            }
+            }*/
             // okay use default string conversion
             result = doConvertToString(context, value);
         } else if (toType == boolean.class) {