[incubator-dubbo] branch 2.7.0-release updated: Merge pull request #3224, support jax-rs annotation on interface as well as on impl.

[liujun]

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.7.0-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.7.0-release by this push:
     new 8e838d5  Merge pull request #3224, support jax-rs annotation on 
interface as well as on impl.
8e838d5 is described below

commit 8e838d5db2d9fb7169b084dd06254a93847c79d2
Author: jefflv <lrq...@gmail.com>
AuthorDate: Mon Jan 14 17:40:55 2019 +0800

    Merge pull request #3224, support jax-rs annotation on interface as well as 
on impl.
---
 .../src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
 
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
index 6c24ca5..7f8bc79 100644
--- 
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
+++ 
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
@@ -90,7 +90,7 @@ public class RestProtocol extends AbstractProxyProtocol {
     @Override
     protected <T> Runnable doExport(T impl, Class<T> type, URL url) throws 
RpcException {
         String addr = getAddr(url);
-        Class implClass = 
ApplicationModel.getProviderModel(url.getServiceKey()).getServiceInterfaceClass();
+        Class implClass = 
ApplicationModel.getProviderModel(url.getServiceKey()).getServiceInstance().getClass();
         RestServer server = servers.get(addr);
         if (server == null) {
             server = 
serverFactory.createServer(url.getParameter(Constants.SERVER_KEY, 
DEFAULT_SERVER));