You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/09/25 08:47:37 UTC
svn commit: r698836 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/util/
components/camel-http/src/main/java/org/apache/camel/component/http/
Author: hadrian
Date: Wed Sep 24 23:47:37 2008
New Revision: 698836
URL: http://svn.apache.org/viewvc?rev=698836&view=rev
Log:
CAMEL-84. More fixes.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java?rev=698836&r1=698835&r2=698836&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java Wed Sep 24 23:47:37 2008
@@ -27,7 +27,7 @@
public NoTypeConversionAvailableException(Object value, Class type) {
super("No type converter available to convert from type: " + (value != null ? value.getClass() : null)
- + " to the required type " + type.getName() + " with value " + value);
+ + " to the required type: " + type.getCanonicalName() + " with value " + value);
this.value = value;
this.type = type;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=698836&r1=698835&r2=698836&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Wed Sep 24 23:47:37 2008
@@ -236,11 +236,7 @@
private static Object convert(TypeConverter typeConverter, Class type, Object value) throws URISyntaxException {
if (typeConverter != null) {
- try {
- return typeConverter.convertTo(type, value);
- } catch (NoTypeConversionAvailableException ex) {
- throw new IllegalArgumentException("Could not convert \"" + value + "\" to " + type.getName());
- }
+ return typeConverter.convertTo(type, value);
}
PropertyEditor editor = PropertyEditorManager.findEditor(type);
if (editor != null) {
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=698836&r1=698835&r2=698836&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Wed Sep 24 23:47:37 2008
@@ -24,6 +24,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Producer;
import org.apache.camel.component.http.helper.LoadingByteArrayOutputStream;
import org.apache.camel.impl.DefaultProducer;
@@ -130,21 +131,17 @@
if (in.getBody() == null) {
return null;
}
- RequestEntity entity = in.getBody(RequestEntity.class);
- if (entity == null) {
-
+ try {
+ return in.getBody(RequestEntity.class);
+ } catch (NoTypeConversionAvailableException ex) {
String data = in.getBody(String.class);
String contentType = in.getHeader("Content-Type", String.class);
try {
- if (contentType != null) {
- return new StringRequestEntity(data, contentType, null);
- }
return new StringRequestEntity(data, null, null);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
- return entity;
}
}