Author: ningjiang
Date: Sun Jan 11 18:52:46 2009
New Revision: 733587
URL: http://svn.apache.org/viewvc?rev=733587&view=rev
Log:
Merged revisions 733582 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r733582 | ningjiang | 2009-01-12 10:23:48 +0800 (Mon, 12 Jan 2009) | 1 line
CXF-1968 applied patch with thanks to William
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 11 18:52:46 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,733582
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java?rev=733587&r1=733586&r2=733587&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
(original)
+++
cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java
Sun Jan 11 18:52:46 2009
@@ -25,6 +25,7 @@
import javax.xml.namespace.QName;
import org.apache.cxf.interceptor.InterceptorProvider;
+import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
@@ -34,7 +35,7 @@
String RESPONSE_CONTEXT = "ResponseContext";
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param operationName The name of the operation to be invoked. The
service namespace will be used
* when looking up the BindingOperationInfo.
* @param params The params that matches the parts of the input message
of the operation. If the
@@ -46,7 +47,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param operationName The name of the operation to be invoked
* @param params The params that matches the parts of the input message
of the operation. If the
* BindingOperationInfo supports unwrapping, it assumes the params are in
the "unwrapped" form. If
@@ -58,7 +59,7 @@
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param operationName The name of the operation to be invoked. The
service namespace will be used
* when looking up the BindingOperationInfo.
* @param params The params that matches the parts of the input message
of the operation
@@ -68,7 +69,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param operationName The name of the operation to be invoked
* @param params The params that matches the parts of the input message
of the operation
* @return The return values that matche the parts of the output message
of the operation
@@ -77,7 +78,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message
of the operation
* @return The return values that matche the parts of the output message
of the operation
@@ -86,7 +87,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation syncronously
+ * Invokes an operation synchronously
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message
of the operation
* @param context Optional (can be null) contextual information for the
invocation
@@ -96,9 +97,21 @@
Object[] params,
Map<String, Object> context) throws Exception;
+ /**
+ * Invokes an operation synchronously
+ * @param oi The operation to be invoked
+ * @param params The params that matches the parts of the input message
of the operation
+ * @param context Optional (can be null) contextual information for the
invocation
+ * @param exchange The Exchange to be used for the invocation
+ * @return The return values that matche the parts of the output message
of the operation
+ */
+ Object[] invoke(BindingOperationInfo oi,
+ Object[] params,
+ Map<String, Object> context,
+ Exchange exchange) throws Exception;
/**
- * Invokes an operation asyncronously
+ * Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked. The
service namespace will be used
* when looking up the BindingOperationInfo.
@@ -112,7 +125,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation asyncronously
+ * Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked
* @param params The params that matches the parts of the input message
of the operation. If the
@@ -126,7 +139,7 @@
/**
- * Invokes an operation asyncronously
+ * Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked. The
service namespace will be used
* when looking up the BindingOperationInfo.
@@ -138,7 +151,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation asyncronously
+ * Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked
* @param params The params that matches the parts of the input message
of the operation
@@ -149,7 +162,7 @@
Object... params) throws Exception;
/**
- * Invokes an operation asyncronously
+ * Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message
of the operation
Modified:
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=733587&r1=733586&r2=733587&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Sun Jan 11 18:52:46 2009
@@ -444,7 +444,10 @@
if (null != reqContext) {
exchange.putAll(reqContext);
}
- exchange.setOneWay(oi.getOutput() == null);
+
+ if (null != oi) {
+ exchange.setOneWay(oi.getOutput() == null);
+ }
exchange.setOutMessage(message);
@@ -472,7 +475,7 @@
}
}
- private Object[] processResult(Message message,
+ protected Object[] processResult(Message message,
Exchange exchange,
BindingOperationInfo oi,
Map<String, Object> resContext) throws
Exception {
@@ -537,7 +540,7 @@
return null;
}
- private void setContext(Map<String, Object> ctx, Message message) {
+ protected void setContext(Map<String, Object> ctx, Message message) {
if (ctx != null) {
message.putAll(ctx);
if (LOG.isLoggable(Level.FINE)) {
@@ -546,7 +549,7 @@
}
}
- private void waitResponse(Exchange exchange) {
+ protected void waitResponse(Exchange exchange) {
int remaining = synchronousTimeout;
while (!Boolean.TRUE.equals(exchange.get(FINISHED)) && remaining > 0) {
long start = System.currentTimeMillis();
@@ -564,7 +567,7 @@
}
}
- private void setParameters(Object[] params, Message message) {
+ protected void setParameters(Object[] params, Message message) {
MessageContentsList contents = new MessageContentsList(params);
message.setContent(List.class, contents);
}
@@ -680,8 +683,10 @@
protected void setOutMessageProperties(Message message,
BindingOperationInfo boi) {
message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
message.put(Message.INBOUND_MESSAGE, Boolean.FALSE);
- message.put(BindingMessageInfo.class, boi.getInput());
- message.put(MessageInfo.class, boi.getOperationInfo().getInput());
+ if (null != boi) {
+ message.put(BindingMessageInfo.class, boi.getInput());
+ message.put(MessageInfo.class, boi.getOperationInfo().getInput());
+ }
}
protected void setExchangeProperties(Exchange exchange,
