Skip to content

Commit 31a5ddb

Browse files
committed
Remove long-obsolete, commented out code from AbstractComboPooledDataSource.
1 parent 1973535 commit 31a5ddb

File tree

1 file changed

+0
-108
lines changed

1 file changed

+0
-108
lines changed

src/com/mchange/v2/c3p0/AbstractComboPooledDataSource.java

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -807,111 +807,3 @@ else if ( this.isWrapperForThis( iface ) )
807807
throw new SQLException(this + " is not a wrapper for or implementation of " + iface.getName());
808808
}
809809
}
810-
811-
//now, referenceability happens exactly the same way it does for PoolBackedDataSource
812-
//all this stuff (and the maintenance hassle of it) should be unnecessary
813-
814-
/*
815-
// WrapperConnectionPoolDataSource properties -- count: 28
816-
//
817-
// ("checkoutTimeout");
818-
// ("acquireIncrement");
819-
// ("acquireRetryAttempts");
820-
// ("acquireRetryDelay");
821-
// ("autoCommitOnClose");
822-
// ("connectionTesterClassName");
823-
// ("forceIgnoreUnresolvedTransactions");
824-
// ("idleConnectionTestPeriod");
825-
// ("initialPoolSize");
826-
// ("maxIdleTime");
827-
// ("maxPoolSize");
828-
// ("maxStatements");
829-
// ("maxStatementsPerConnection");
830-
// ("minPoolSize");
831-
// ("propertyCycle");
832-
// ("breakAfterAcquireFailure");
833-
// ("testConnectionOnCheckout");
834-
// ("testConnectionOnCheckin");
835-
// ("usesTraditionalReflectiveProxies");
836-
// ("preferredTestQuery");
837-
// ("automaticTestTable");
838-
// ("userOverridesAsString");
839-
// ("overrideDefaultUser");
840-
// ("overrideDefaultPassword");
841-
// ("maxAdministrativeTaskTime");
842-
// ("maxIdleTimeExcessConnections");
843-
// ("maxConnectionAge");
844-
// ("connectionTesterClassName");
845-
846-
final static JavaBeanReferenceMaker referenceMaker = new JavaBeanReferenceMaker();
847-
848-
static
849-
{
850-
referenceMaker.setFactoryClassName( C3P0JavaBeanObjectFactory.class.getName() );
851-
852-
// DriverManagerDataSource properties (count: 4)
853-
referenceMaker.addReferenceProperty("description");
854-
referenceMaker.addReferenceProperty("driverClass");
855-
referenceMaker.addReferenceProperty("jdbcUrl");
856-
referenceMaker.addReferenceProperty("properties");
857-
858-
// WrapperConnectionPoolDataSource properties (count: 27)
859-
referenceMaker.addReferenceProperty("checkoutTimeout");
860-
referenceMaker.addReferenceProperty("acquireIncrement");
861-
referenceMaker.addReferenceProperty("acquireRetryAttempts");
862-
referenceMaker.addReferenceProperty("acquireRetryDelay");
863-
referenceMaker.addReferenceProperty("autoCommitOnClose");
864-
referenceMaker.addReferenceProperty("connectionTesterClassName");
865-
referenceMaker.addReferenceProperty("forceIgnoreUnresolvedTransactions");
866-
referenceMaker.addReferenceProperty("idleConnectionTestPeriod");
867-
referenceMaker.addReferenceProperty("initialPoolSize");
868-
referenceMaker.addReferenceProperty("maxIdleTime");
869-
referenceMaker.addReferenceProperty("maxPoolSize");
870-
referenceMaker.addReferenceProperty("maxStatements");
871-
referenceMaker.addReferenceProperty("maxStatementsPerConnection");
872-
referenceMaker.addReferenceProperty("minPoolSize");
873-
referenceMaker.addReferenceProperty("propertyCycle");
874-
referenceMaker.addReferenceProperty("breakAfterAcquireFailure");
875-
referenceMaker.addReferenceProperty("testConnectionOnCheckout");
876-
referenceMaker.addReferenceProperty("testConnectionOnCheckin");
877-
referenceMaker.addReferenceProperty("usesTraditionalReflectiveProxies");
878-
referenceMaker.addReferenceProperty("preferredTestQuery");
879-
referenceMaker.addReferenceProperty("automaticTestTable");
880-
referenceMaker.addReferenceProperty("userOverridesAsString");
881-
referenceMaker.addReferenceProperty("overrideDefaultUser");
882-
referenceMaker.addReferenceProperty("overrideDefaultPassword");
883-
referenceMaker.addReferenceProperty("maxAdministrativeTaskTime");
884-
referenceMaker.addReferenceProperty("maxIdleTimeExcessConnections");
885-
referenceMaker.addReferenceProperty("maxConnectionAge");
886-
887-
// PoolBackedDataSource properties (count: 2)
888-
referenceMaker.addReferenceProperty("dataSourceName");
889-
referenceMaker.addReferenceProperty("numHelperThreads");
890-
891-
// identity token
892-
referenceMaker.addReferenceProperty("identityToken");
893-
894-
// shared properties (count: 1)
895-
referenceMaker.addReferenceProperty("factoryClassLocation");
896-
}
897-
898-
public Reference getReference() throws NamingException
899-
{
900-
synchronized ( this )
901-
{
902-
synchronized ( wcpds )
903-
{
904-
synchronized( dmds )
905-
{
906-
//System.err.println("ComboPooledDataSource.getReference()!!!!");
907-
//new Exception("PRINT-STACK-TRACE").printStackTrace();
908-
//javax.naming.Reference out = referenceMaker.createReference( this );
909-
//System.err.println(out);
910-
//return out;
911-
912-
return referenceMaker.createReference( this );
913-
}
914-
}
915-
}
916-
}
917-
*/

0 commit comments

Comments
 (0)