bug fixed for ConfigFilter set MaxWait error

This commit is contained in:
wenshao
2013-05-11 01:14:37 +08:00
parent 3062c800fc
commit 39e70139fd
3 changed files with 3 additions and 2 deletions
@@ -248,8 +248,6 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
this.useLocalSessionState = useLocalSessionState;
}
public boolean isOracle() {
return isOracle;
}
@@ -33,6 +33,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.management.JMException;
import javax.management.ObjectName;
@@ -383,6 +384,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return;
}
final ReentrantLock lock = this.lock;
try {
lock.lockInterruptibly();
} catch (InterruptedException e) {
@@ -29,6 +29,7 @@ public class ConfigFileGenerator {
filePath = file.getAbsolutePath();
out = new PrintWriter(new FileWriter(file));
out.println(DruidDataSourceFactory.PROP_MAXWAIT + "=1000");
out.println(DruidDataSourceFactory.PROP_USERNAME + "=test1");
out.println(DruidDataSourceFactory.PROP_PASSWORD + "=OJfUm6WCHi7EuXqE6aEc+Po2xFrAGBeSNy8O2jWhV2FTG8/5kbRRr2rjNKhptlevm/03Y0048P7h88gdUOXAYg==");
out.println(DruidDataSourceFactory.PROP_URL + "=jdbc:oracle:thin:@");