You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/08/07 18:00:48 UTC
svn commit: r429375 -
/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
Author: gnodet
Date: Mon Aug 7 09:00:48 2006
New Revision: 429375
URL: http://svn.apache.org/viewvc?rev=429375&view=rev
Log:
SM-518: MessageExchangeFactoryImpl.setDefaults(MessageExchangeImpl exchange) check for null
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java?rev=429375&r1=429374&r2=429375&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java Mon Aug 7 09:00:48 2006
@@ -249,17 +249,19 @@
protected void setDefaults(MessageExchangeImpl exchange) {
exchange.setOperation(getOperationName());
- if (endpoint != null){
+ if (endpoint != null) {
exchange.setEndpoint(getEndpoint());
- }else {
+ } else {
exchange.setService(serviceName);
exchange.setInterfaceName(interfaceName);
}
-
- exchange.setSourceContext(getContext());
- PojoMarshaler marshaler = getContext().getActivationSpec().getMarshaler();
- if (marshaler != null) {
- exchange.setMarshaler(marshaler);
+
+ if (getContext() != null) {
+ exchange.setSourceContext(getContext());
+ PojoMarshaler marshaler = getContext().getActivationSpec().getMarshaler();
+ if (marshaler != null) {
+ exchange.setMarshaler(marshaler);
+ }
}
exchange.setProperty(JbiConstants.DATESTAMP_PROPERTY_NAME, Calendar.getInstance());
}