Update RPCFuture and test service

zengfr · Jul 27, 2020 · 5c6e637 · 5c6e637
1 parent 4df3b20
commit 5c6e637
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/netty-rpc-client/src/main/java/com/netty/rpc/client/handler/RPCFuture.java b/netty-rpc-client/src/main/java/com/netty/rpc/client/handler/RPCFuture.java
@@ -43,7 +43,7 @@ public boolean isDone() {
 
     @Override
     public Object get() {
-        sync.acquire(-1);
+        sync.acquire(1);
         if (this.response != null) {
             return this.response.getResult();
         } else {
@@ -53,7 +53,7 @@ public Object get() {
 
     @Override
     public Object get(long timeout, TimeUnit unit) throws InterruptedException {
-        boolean success = sync.tryAcquireNanos(-1, unit.toNanos(timeout));
+        boolean success = sync.tryAcquireNanos(1, unit.toNanos(timeout));
         if (success) {
             if (this.response != null) {
                 return this.response.getResult();

diff --git a/netty-rpc-test/src/main/java/com/app/test/server/RpcBootstrapWithoutSpring.java b/netty-rpc-test/src/main/java/com/app/test/server/RpcBootstrapWithoutSpring.java
@@ -1,6 +1,8 @@
 package com.app.test.server;
 
+import com.app.test.service.HelloServiceImpl;
 import com.app.test.service.PersonService;
+import com.app.test.service.PersonServiceImpl;
 import com.netty.rpc.server.ServiceRegistry;
 import com.netty.rpc.server.RpcServer;
 import com.app.test.service.HelloService;

diff --git a/...com/app/test/server/HelloServiceImpl.java → ...om/app/test/service/HelloServiceImpl.java b/...com/app/test/server/HelloServiceImpl.java → ...om/app/test/service/HelloServiceImpl.java
@@ -1,4 +1,4 @@
-package com.app.test.server;
+package com.app.test.service;
 
 import com.netty.rpc.server.RpcService;
 import com.app.test.service.HelloService;

diff --git a/...om/app/test/server/PersonServiceImpl.java → ...m/app/test/service/PersonServiceImpl.java b/...om/app/test/server/PersonServiceImpl.java → ...m/app/test/service/PersonServiceImpl.java
@@ -1,4 +1,4 @@
-package com.app.test.server;
+package com.app.test.service;
 
 import com.netty.rpc.server.RpcService;
 import com.app.test.service.Person;

diff --git a/netty-rpc-test/src/main/java/com/app/test/util/JsonTest.java b/netty-rpc-test/src/main/java/com/app/test/util/JsonTest.java
@@ -3,7 +3,7 @@
 import com.netty.rpc.protocol.RpcRequest;
 import com.netty.rpc.protocol.RpcResponse;
 import com.app.test.service.Person;
-import com.app.test.server.HelloServiceImpl;
+import com.app.test.service.HelloServiceImpl;
 import com.netty.rpc.util.JsonUtil;
 import com.netty.rpc.util.SerializationUtil;
 

diff --git a/netty-rpc-test/src/main/resources/server-spring.xml b/netty-rpc-test/src/main/resources/server-spring.xml
@@ -7,7 +7,8 @@
        http://www.springframework.org/schema/context
        http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <context:component-scan base-package="com.app.test.server"/>
+    <!--scan service package-->
+    <context:component-scan base-package="com.app.test.service"/>
 
     <context:property-placeholder location="classpath:rpc.properties"/>