diff --git a/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java b/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java index a459db71417b28eae19db1c5eff6189e155b532d..e9e37173ded60606c0f366a1eeeea8c349e53f1d 100644 --- a/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java +++ b/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java @@ -1,12 +1,12 @@ /* * Copyright 1999-2012 Alibaba Group. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,7 @@ import com.alibaba.dubbo.rpc.RpcResult; import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; -import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import org.apache.commons.pool.impl.GenericObjectPool; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; import redis.clients.jedis.exceptions.JedisConnectionException; @@ -67,24 +67,24 @@ public class RedisProtocol extends AbstractProtocol { public Invoker refer(final Class type, final URL url) throws RpcException { try { - GenericObjectPoolConfig config = new GenericObjectPoolConfig(); - config.setTestOnBorrow(url.getParameter("test.on.borrow", true)); - config.setTestOnReturn(url.getParameter("test.on.return", false)); - config.setTestWhileIdle(url.getParameter("test.while.idle", false)); + GenericObjectPool.Config config = new GenericObjectPool.Config(); + config.testOnBorrow = url.getParameter("test.on.borrow", true); + config.testOnReturn = url.getParameter("test.on.return", false); + config.testWhileIdle = url.getParameter("test.while.idle", false); if (url.getParameter("max.idle", 0) > 0) - config.setMaxIdle(url.getParameter("max.idle", 0)); + config.maxIdle = url.getParameter("max.idle", 0); if (url.getParameter("min.idle", 0) > 0) - config.setMinIdle(url.getParameter("min.idle", 0)); - if (url.getParameter("max.total", 0) > 0) - config.setMaxTotal(url.getParameter("max.total", 0)); + config.minIdle = url.getParameter("min.idle", 0); + if (url.getParameter("max.active", 0) > 0) + config.maxActive = url.getParameter("max.active", 0); if (url.getParameter("max.wait", 0) > 0) - config.setMaxWaitMillis(url.getParameter("max.wait", 0)); + config.maxWait = url.getParameter("max.wait", 0); if (url.getParameter("num.tests.per.eviction.run", 0) > 0) - config.setNumTestsPerEvictionRun(url.getParameter("num.tests.per.eviction.run", 0)); + config.numTestsPerEvictionRun = url.getParameter("num.tests.per.eviction.run", 0); if (url.getParameter("time.between.eviction.runs.millis", 0) > 0) - config.setTimeBetweenEvictionRunsMillis(url.getParameter("time.between.eviction.runs.millis", 0)); + config.timeBetweenEvictionRunsMillis = url.getParameter("time.between.eviction.runs.millis", 0); if (url.getParameter("min.evictable.idle.time.millis", 0) > 0) - config.setMinEvictableIdleTimeMillis(url.getParameter("min.evictable.idle.time.millis", 0)); + config.minEvictableIdleTimeMillis = url.getParameter("min.evictable.idle.time.millis", 0); final JedisPool jedisPool = new JedisPool(config, url.getHost(), url.getPort(DEFAULT_PORT), url.getParameter(Constants.TIMEOUT_KEY, Constants.DEFAULT_TIMEOUT)); final int expiry = url.getParameter("expiry", 0);