You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2008/08/06 09:38:44 UTC
svn commit: r683141 -
/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
Author: ffang
Date: Wed Aug 6 00:38:44 2008
New Revision: 683141
URL: http://svn.apache.org/viewvc?rev=683141&view=rev
Log:
fix checkstyle error
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?rev=683141&r1=683140&r2=683141&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java Wed Aug 6 00:38:44 2008
@@ -190,11 +190,11 @@
return soapHelper.createContext();
}
- protected Message fromNMS(NormalizedMessage nm, Session session) throws Exception {
+ protected Message fromNMS(NormalizedMessage nm, Session mySession) throws Exception {
SoapMessage soap = new SoapMessage();
soapHelper.getJBIMarshaler().fromNMS(soap, nm);
Map headers = (Map) nm.getProperty(JbiConstants.PROTOCOL_HEADERS);
- return endpoint.getMarshaler().toJMS(soap, headers, session);
+ return endpoint.getMarshaler().toJMS(soap, headers, mySession);
}
protected MessageExchange toNMS(Message message, Context ctx) throws Exception {
@@ -207,7 +207,7 @@
return exchange;
}
- protected Message fromNMSResponse(MessageExchange exchange, Context ctx, Session session) throws Exception {
+ protected Message fromNMSResponse(MessageExchange exchange, Context ctx, Session mySession) throws Exception {
Message response = null;
if (exchange.getStatus() == ExchangeStatus.ERROR) {
// marshal error
@@ -215,7 +215,7 @@
if (e == null) {
e = new Exception("Unkown error");
}
- response = endpoint.getMarshaler().toJMS(e, session);
+ response = endpoint.getMarshaler().toJMS(e, mySession);
} else if (exchange.getStatus() == ExchangeStatus.ACTIVE) {
// check for fault
Fault jbiFault = exchange.getFault();
@@ -224,24 +224,24 @@
SoapFault fault = new SoapFault(SoapFault.RECEIVER, null, null, null, jbiFault.getContent());
SoapMessage soapFault = soapHelper.onFault(ctx, fault);
Map headers = (Map) jbiFault.getProperty(JbiConstants.PROTOCOL_HEADERS);
- response = endpoint.getMarshaler().toJMS(soapFault, headers, session);
+ response = endpoint.getMarshaler().toJMS(soapFault, headers, mySession);
} else {
NormalizedMessage outMsg = exchange.getMessage("out");
if (outMsg != null) {
SoapMessage out = soapHelper.onReply(ctx, outMsg);
Map headers = (Map) outMsg.getProperty(JbiConstants.PROTOCOL_HEADERS);
- response = endpoint.getMarshaler().toJMS(out, headers, session);
+ response = endpoint.getMarshaler().toJMS(out, headers, mySession);
}
}
}
return response;
}
- protected Message createMessageFromExchange(Session session,
+ protected Message createMessageFromExchange(Session mySession,
MessageExchange exchange) throws Exception {
// TextMessage msg = session.createTextMessage();
NormalizedMessage nm = exchange.getMessage("in");
- Message msg = fromNMS(nm, session);
+ Message msg = fromNMS(nm, mySession);
// Build the SoapAction from <interface namespace>/<interface
// name>/<operation name>