~mark-matthews-a/connectorj/trunk

« back to all changes in this revision

Viewing changes to src/com/mysql/jdbc/NonRegisteringDriver.java

Committer: mark.matthews at oracle
Date: 2010-05-12 15:38:46 UTC
mfrom: (847.1.94 branch_5_1-local)
Revision ID: mark.matthews@oracle.com-20100512153846-bdyw3aezw5o1szmu

Merged from 5.1

files added:
src/com/mysql/jdbc/ConnectionGroup.java

src/com/mysql/jdbc/ConnectionGroupManager.java

src/com/mysql/jdbc/FailoverConnectionProxy.java

src/com/mysql/jdbc/LoadBalanceExceptionChecker.java

src/com/mysql/jdbc/LoadBalancedMySQLConnection.java

src/com/mysql/jdbc/MySQLConnection.java

src/com/mysql/jdbc/NdbLoadBalanceExceptionChecker.java

src/com/mysql/jdbc/SequentialBalanceStrategy.java

src/com/mysql/jdbc/StandardLoadBalanceExceptionChecker.java

src/com/mysql/jdbc/jmx

src/com/mysql/jdbc/jmx/LoadBalanceConnectionGroupManager.java

src/com/mysql/jdbc/jmx/LoadBalanceConnectionGroupManagerMBean.java

files renamed:
src/com/mysql/jdbc/profiler/ProfilerEventHandlerFactory.java => src/com/mysql/jdbc/ProfilerEventHandlerFactory.java

files modified:
.bzrignore

.settings/org.eclipse.jdt.core.prefs

CHANGES

build.xml

src/com/mysql/jdbc/BalanceStrategy.java

src/com/mysql/jdbc/BestResponseTimeBalanceStrategy.java

src/com/mysql/jdbc/Buffer.java

src/com/mysql/jdbc/BufferRow.java

src/com/mysql/jdbc/ByteArrayRow.java

src/com/mysql/jdbc/CallableStatement.java

src/com/mysql/jdbc/CommunicationsException.java

src/com/mysql/jdbc/Connection.java

src/com/mysql/jdbc/ConnectionFeatureNotAvailableException.java

src/com/mysql/jdbc/ConnectionImpl.java

src/com/mysql/jdbc/ConnectionProperties.java

src/com/mysql/jdbc/ConnectionPropertiesImpl.java

src/com/mysql/jdbc/DatabaseMetaData.java

src/com/mysql/jdbc/DatabaseMetaDataUsingInfoSchema.java

src/com/mysql/jdbc/EscapeProcessor.java

src/com/mysql/jdbc/Field.java

src/com/mysql/jdbc/JDBC4CallableStatement.java

src/com/mysql/jdbc/JDBC4Connection.java

src/com/mysql/jdbc/JDBC4DatabaseMetaData.java

src/com/mysql/jdbc/JDBC4DatabaseMetaDataUsingInfoSchema.java

src/com/mysql/jdbc/JDBC4PreparedStatement.java

src/com/mysql/jdbc/JDBC4ResultSet.java

src/com/mysql/jdbc/JDBC4ServerPreparedStatement.java

src/com/mysql/jdbc/JDBC4UpdatableResultSet.java

src/com/mysql/jdbc/LoadBalancingConnectionProxy.java

src/com/mysql/jdbc/LocalizedErrorMessages.properties

src/com/mysql/jdbc/MysqlIO.java

src/com/mysql/jdbc/NonRegisteringDriver.java

src/com/mysql/jdbc/PreparedStatement.java

src/com/mysql/jdbc/RandomBalanceStrategy.java

src/com/mysql/jdbc/ReplicationConnection.java

src/com/mysql/jdbc/ResultSetImpl.java

src/com/mysql/jdbc/ResultSetRow.java

src/com/mysql/jdbc/RowDataDynamic.java

src/com/mysql/jdbc/SQLError.java

src/com/mysql/jdbc/ServerPreparedStatement.java

src/com/mysql/jdbc/Statement.java

src/com/mysql/jdbc/StatementImpl.java

src/com/mysql/jdbc/StringUtils.java

src/com/mysql/jdbc/TimeUtil.java

src/com/mysql/jdbc/UpdatableResultSet.java

src/com/mysql/jdbc/exceptions/jdbc4/CommunicationsException.java

src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java

src/lib-nodist/commercialLicense.txt

src/testsuite/BaseTestCase.java

src/testsuite/regression/CallableStatementRegressionTest.java

src/testsuite/regression/ConnectionRegressionTest.java

src/testsuite/regression/MetaDataRegressionTest.java

src/testsuite/regression/ResultSetRegressionTest.java

src/testsuite/regression/StatementRegressionTest.java

src/testsuite/simple/CharsetTests.java

src/testsuite/simple/ResultSetTest.java

src/testsuite/simple/XATest.java

Show diffs side-by-side

added added

removed removed

src/com/mysql/jdbc/NonRegisteringDriver.java

281

return null;

282

}

283

284

if (!"1".equals(props.getProperty(NUM_HOSTS_PROPERTY_KEY))) {

285

return connectFailover(url, info);

286

}

287

284

288

try {

285

289

Connection newConn = com.mysql.jdbc.ConnectionImpl.getInstance(

286

290

host(props), port(props), props, database(props), url);

316

320

317

321

int numHosts = Integer.parseInt(parsedProps.getProperty(NUM_HOSTS_PROPERTY_KEY));

318

322

319

List hostList = new ArrayList();

323

List<String> hostList = new ArrayList<String>();

320

324

321

325

for (int i = 0; i < numHosts; i++) {

322

326

int index = i + 1;

332

336

.getClass().getClassLoader(),

333

337

new Class[] { com.mysql.jdbc.Connection.class }, proxyBal);

334

338

}

339

340

private java.sql.Connection connectFailover(String url, Properties info)

341

throws SQLException {

342

Properties parsedProps = parseURL(url, info);

343

344

// People tend to drop this in, it doesn't make sense

345

parsedProps.remove("roundRobinLoadBalance");

346

parsedProps.setProperty("autoReconnect", "false");

347

348

if (parsedProps == null) {

349

return null;

350

}

351

352

int numHosts = Integer.parseInt(parsedProps

353

.getProperty(NUM_HOSTS_PROPERTY_KEY));

354

355

List<String> hostList = new ArrayList<String>();

356

357

for (int i = 0; i < numHosts; i++) {

358

int index = i + 1;

359

360

hostList.add(parsedProps.getProperty(HOST_PROPERTY_KEY + "."

361

+ index)

362

+ ":"

363

+ parsedProps.getProperty(PORT_PROPERTY_KEY + "." + index));

364

}

365

366

FailoverConnectionProxy connProxy = new FailoverConnectionProxy(

367

hostList, parsedProps);

368

369

return (java.sql.Connection) java.lang.reflect.Proxy.newProxyInstance(

370

this.getClass().getClassLoader(),

371

new Class[] { com.mysql.jdbc.Connection.class }, connProxy);

372

}

335

373

336

374

protected java.sql.Connection connectReplicationConnection(String url, Properties info)

337

375

throws SQLException {

Older »