Author: ningjiang Date: Sun Jan 11 19:15:23 2009 New Revision: 733591 URL: http://svn.apache.org/viewvc?rev=733591&view=rev Log: Merged revisions 733587 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r733587 | ningjiang | 2009-01-12 10:52:46 +0800 (Mon, 12 Jan 2009) | 9 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 11 19:15:23 2009 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726754,726756-726758,726995 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726637,726639,726692,726724,726992 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726754,726756-726758,726995,733587 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726637,726639,726692,726724,726992,733582 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java?rev=733591&r1=733590&r2=733591&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java (original) +++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/endpoint/Client.java Sun Jan 11 19:15:23 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.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=733591&r1=733590&r2=733591&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Sun Jan 11 19:15:23 2009 @@ -424,7 +424,10 @@ if (null != reqContext) { exchange.putAll(reqContext); } - exchange.setOneWay(oi.getOutput() == null); + + if (null != oi) { + exchange.setOneWay(oi.getOutput() == null); + } exchange.setOutMessage(message); @@ -452,7 +455,7 @@ } } - private Object[] processResult(Message message, + protected Object[] processResult(Message message, Exchange exchange, BindingOperationInfo oi, Map<String, Object> resContext) throws Exception { @@ -517,7 +520,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)) { @@ -526,7 +529,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(); @@ -544,7 +547,7 @@ } } - private void setParameters(Object[] params, Message message) { + protected void setParameters(Object[] params, Message message) { if (params == null) { params = new Object[0]; } @@ -663,8 +666,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,
