优化连接池

mrdear · mrdear · commit 74b4260b8b22 · 2017-02-09T23:13:59.000+08:00
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientPool.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientPool.java
@@ -37,7 +37,7 @@ public class HelloWorldClientPool {
   /**
    * 从连接池获取对象
    */
-  public static HelloWorldClientSingle borrowObject(){
+  private static HelloWorldClientSingle borrowObject(){
     try {
       HelloWorldClientSingle clientSingle = objectPool.borrowObject();
       System.out.println("总创建线程数"+objectPool.getCreatedCount());
@@ -49,13 +49,6 @@ public static HelloWorldClientSingle borrowObject(){
     return createClient();
   }
 
-  /**
-   * 还送对象
-   */
-  public static void returnObject(HelloWorldClientSingle clientSingle){
-    objectPool.returnObject(clientSingle);
-  }
-
   /**
    * 当连接池异常,则主动创建对象
    */
@@ -74,7 +67,7 @@ public static Runnable execute(WorkCallBack<HelloWorldClientSingle> workCallBack
        workCallBack.callback(client);
       } finally {
         /** 将连接对象返回给连接池 */
-        returnObject(client);
+        objectPool.returnObject(client);
       }
     };
   }
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientTest.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldClientTest.java
@@ -13,7 +13,4 @@ public static void main(String[] args) {
       })).start();
     }
   }
-
-
-
 }
diff --git a/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldFactory.java b/gRPC-Demo/src/main/java/cn/mrdear/grpc/hellopool/HelloWorldFactory.java
@@ -24,4 +24,10 @@ public HelloWorldClientSingle create() throws Exception {
   public PooledObject<HelloWorldClientSingle> wrap(HelloWorldClientSingle helloWorldClientSingle) {
     return new DefaultPooledObject<>(helloWorldClientSingle);
   }
+
+  @Override
+  public void destroyObject(PooledObject<HelloWorldClientSingle> p) throws Exception {
+    p.getObject().shutdown();
+    super.destroyObject(p);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,4 @@ public static void main(String[] args) {`
`13`	`13`	`})).start();`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`-`
`17`		`-`
`18`		`-`
`19`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,10 @@ public HelloWorldClientSingle create() throws Exception {`
`24`	`24`	`public PooledObject<HelloWorldClientSingle> wrap(HelloWorldClientSingle helloWorldClientSingle) {`
`25`	`25`	`return new DefaultPooledObject<>(helloWorldClientSingle);`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ @Override`
	`29`	`+ public void destroyObject(PooledObject<HelloWorldClientSingle> p) throws Exception {`
	`30`	`+ p.getObject().shutdown();`
	`31`	`+ super.destroyObject(p);`
	`32`	`+ }`
`27`	`33`	`}`