Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 53588 invoked from network); 4 May 2010 16:03:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 May 2010 16:03:31 -0000 Received: (qmail 10582 invoked by uid 500); 4 May 2010 16:03:31 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 10561 invoked by uid 500); 4 May 2010 16:03:31 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 10554 invoked by uid 99); 4 May 2010 16:03:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 May 2010 16:03:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 May 2010 16:03:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D836A2388978; Tue, 4 May 2010 16:02:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r940925 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Date: Tue, 04 May 2010 16:02:38 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100504160238.D836A2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Tue May 4 16:02:38 2010 New Revision: 940925 URL: http://svn.apache.org/viewvc?rev=940925&view=rev Log: Added more code comments to default type converter about can promote / cannot promote. Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=940925&r1=940924&r2=940925&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Tue May 4 16:02:38 2010 @@ -64,10 +64,15 @@ public class DefaultTypeConverter extend // add to string first as it will then be last in the last as to string can nearly // always convert something to a string so we want it only as the last resort + // ToStringTypeConverter should NOT allow to be promoted addFallbackTypeConverter(new ToStringTypeConverter(), false); + // enum is okay to be promoted addFallbackTypeConverter(new EnumTypeConverter(), true); + // arrays is okay to be promoted addFallbackTypeConverter(new ArrayTypeConverter(), true); - addFallbackTypeConverter(new PropertyEditorTypeConverter(), true); + // do not assume property editor as it has a String converter + addFallbackTypeConverter(new PropertyEditorTypeConverter(), false); + // and future should also not allowed to be promoted addFallbackTypeConverter(new FutureTypeConverter(this), false); } @@ -194,9 +199,7 @@ public class DefaultTypeConverter extend } } - // TODO: check before if its type/value is primitive/wrapper combo which we can convert asap then - - // primitives + // not found with that type then if it was a primitive type then try again with the wrapper type if (type.isPrimitive()) { Class primitiveType = ObjectHelper.convertPrimitiveTypeToWrapperType(type); if (primitiveType != type) {