Author: ffang
Date: Fri Jun 25 02:04:52 2010
New Revision: 957781
URL: http://svn.apache.org/viewvc?rev=957781&view=rev
Log:
[SMX4-539] Inconsistent use of Endpoint.INTERFACE_NAME in cxf nmr transport
Modified:
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
Modified:
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java?rev=957781&r1=957780&r2=957781&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
(original)
+++
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRConduitOutputStream.java
Fri Jun 25 02:04:52 2010
@@ -143,8 +143,12 @@ public class NMRConduitOutputStream exte
LOG.info("service for exchange " + serviceName);
Map<String,Object> refProps = new HashMap<String,Object>();
- refProps.put(Endpoint.INTERFACE_NAME, interfaceName);
- refProps.put(Endpoint.SERVICE_NAME, serviceName);
+ if (interfaceName != null) {
+ refProps.put(Endpoint.INTERFACE_NAME,
interfaceName.toString());
+ }
+ if (serviceName != null) {
+ refProps.put(Endpoint.SERVICE_NAME, serviceName.toString());
+ }
Reference ref =
channel.getNMR().getEndpointRegistry().lookup(refProps);
xchng.setTarget(ref);
xchng.setOperation(bop.getName());
Modified:
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java?rev=957781&r1=957780&r2=957781&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
(original)
+++
servicemix/smx4/features/trunk/cxf/cxf-transport-nmr/src/main/java/org/apache/servicemix/cxf/transport/nmr/NMRDestination.java
Fri Jun 25 02:04:52 2010
@@ -71,8 +71,8 @@ public class NMRDestination extends Abst
this.properties.put(Endpoint.NAME, info.getName().toString());
}
- this.properties.put(Endpoint.SERVICE_NAME,
info.getService().getName());
- this.properties.put(Endpoint.INTERFACE_NAME,
info.getInterface().getName());
+ this.properties.put(Endpoint.SERVICE_NAME,
info.getService().getName().toString());
+ this.properties.put(Endpoint.INTERFACE_NAME,
info.getInterface().getName().toString());
}
public void setChannel(Channel dc) {
