Author: david.lloyd(a)jboss.com Date: 2009-10-16 20:14:13 -0400 (Fri, 16 Oct 2009) New Revision: 5561 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Client.java remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ClientImpl.java Log: Fix a problem where typed request invocations are ambiguous with respect to regular requests Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Client.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Client.java 2009-10-17 00:13:42 UTC (rev 5560) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Client.java 2009-10-17 00:14:13 UTC (rev 5561) @@ -117,7 +117,7 @@ * @throws IOException if an I/O error occurred while sending the request * @throws CancellationException if the operation was cancelled asynchronously */ - <T extends O> T invoke(TypedRequest<? extends I, T> request) throws IOException, CancellationException, ClassCastException; + <T extends O> T invokeTyped(TypedRequest<? extends I, T> request) throws IOException, CancellationException, ClassCastException; /** * Send a request asynchronously. If the remote side manipulates a stream, it @@ -165,5 +165,5 @@ * @throws IOException if some other I/O error occurred while sending the request * @see #send(Object) send(I) */ - <T extends O> IoFuture<? extends T> send(TypedRequest<? extends I, T> request) throws IOException; + <T extends O> IoFuture<? extends T> sendTyped(TypedRequest<? extends I, T> request) throws IOException; } Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ClientImpl.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-10-17 00:13:42 UTC (rev 5560) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-10-17 00:14:13 UTC (rev 5561) @@ -96,7 +96,7 @@ } } - public <T extends O> T invoke(final TypedRequest<? extends I, T> typedRequest) throws IOException, CancellationException { + public <T extends O> T invokeTyped(final TypedRequest<? extends I, T> typedRequest) throws IOException, CancellationException { return invoke(requestClass.cast(typedRequest), typedRequest.getReplyClass()); } @@ -117,7 +117,7 @@ return futureReply; } - public <T extends O> IoFuture<? extends T> send(final TypedRequest<? extends I, T> typedRequest) throws IOException { + public <T extends O> IoFuture<? extends T> sendTyped(final TypedRequest<? extends I, T> typedRequest) throws IOException { return send(requestClass.cast(typedRequest), typedRequest.getReplyClass()); }