[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ProxyFactory.java,1.27,1.28

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11648/src/java/org/logicalcobwebs/proxool

Modified Files:
	ProxyFactory.java 
Log Message:
Injectable interface fixes.

Index: ProxyFactory.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyFactory.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ProxyFactory.java	2 Jun 2004 20:50:47 -0000	1.27
--- ProxyFactory.java	17 Jun 2004 21:58:36 -0000	1.28
***************
*** 125,128 ****
--- 125,131 ----
       */
      private static Class[] getInterfaces(Class clazz, ConnectionPool connectionPool) {
+         if (LOG.isDebugEnabled()) {
+             LOG.debug("Looking up injectable interfaces for " + clazz);
+         }
          Class[] interfaceArray = (Class[]) interfaceMap.get(clazz);
          if (interfaceArray == null) {
***************
*** 133,153 ****
                  // we check CallableStatement then PreparedStatement then Statement or all three will get
                  // caught by Statement
-                 Class injectableClass = null;
                  if (Connection.class.isAssignableFrom(clazz)) {
!                     injectableClass = connectionPool.getDefinition().getInjectableConnectionInterface();
!                 } else if (CallableStatement.class.isAssignableFrom(clazz)) {
!                     injectableClass = connectionPool.getDefinition().getInjectableCallableStatementInterface();
!                 } else if (PreparedStatement.class.isAssignableFrom(clazz)) {
!                     injectableClass = connectionPool.getDefinition().getInjectablePreparedStatementInterface();
!                 } else if (Statement.class.isAssignableFrom(clazz)) {
!                     injectableClass = connectionPool.getDefinition().getInjectableStatementInterface();
                  }
!                 // Inject it if it was configured.
!                 if (injectableClass != null) {
!                     interfaces.add(injectableClass);
                  }
              }
              interfaceArray = (Class[]) interfaces.toArray(new Class[interfaces.size()]);
- /*
              if (LOG.isDebugEnabled()) {
                  for (int i = 0; i < interfaceArray.length; i++) {
--- 136,184 ----
                  // we check CallableStatement then PreparedStatement then Statement or all three will get
                  // caught by Statement
                  if (Connection.class.isAssignableFrom(clazz)) {
!                     Class injectableClass = connectionPool.getDefinition().getInjectableConnectionInterface();
!                     // Inject it if it was configured.
!                     if (injectableClass != null) {
!                         interfaces.add(injectableClass);
!                         if (LOG.isDebugEnabled()) {
!                             LOG.debug("Injecting " + injectableClass + " into " + clazz);
!                         }
!                     }
                  }
!                 if (CallableStatement.class.isAssignableFrom(clazz)) {
!                     if (LOG.isDebugEnabled()) {
!                         LOG.debug("Getting injectableCallableStatementInterface");
!                     }
!                     Class injectableClass = connectionPool.getDefinition().getInjectableCallableStatementInterface();
!                     // Inject it if it was configured.
!                     if (injectableClass != null) {
!                         interfaces.add(injectableClass);
!                         if (LOG.isDebugEnabled()) {
!                             LOG.debug("Injecting " + injectableClass + " into " + clazz);
!                         }
!                     }
!                 }
!                 if (PreparedStatement.class.isAssignableFrom(clazz)) {
!                     Class injectableClass = connectionPool.getDefinition().getInjectablePreparedStatementInterface();
!                     // Inject it if it was configured.
!                     if (injectableClass != null) {
!                         interfaces.add(injectableClass);
!                         if (LOG.isDebugEnabled()) {
!                             LOG.debug("Injecting " + injectableClass + " into " + clazz);
!                         }
!                     }
!                 }
!                 if (Statement.class.isAssignableFrom(clazz)) {
!                     Class injectableClass = connectionPool.getDefinition().getInjectableStatementInterface();
!                     // Inject it if it was configured.
!                     if (injectableClass != null) {
!                         interfaces.add(injectableClass);
!                         if (LOG.isDebugEnabled()) {
!                             LOG.debug("Injecting " + injectableClass + " into " + clazz);
!                         }
!                     }
                  }
              }
              interfaceArray = (Class[]) interfaces.toArray(new Class[interfaces.size()]);
              if (LOG.isDebugEnabled()) {
                  for (int i = 0; i < interfaceArray.length; i++) {
***************
*** 156,160 ****
                  }
              }
- */
              interfaceMap.put(clazz, interfaceArray);
  /*
--- 187,190 ----
***************
*** 260,263 ****
--- 290,296 ----
   Revision history:
   $Log$
+  Revision 1.28  2004/06/17 21:58:36  billhorsman
+  Injectable interface fixes.
+ 
   Revision 1.27  2004/06/02 20:50:47  billhorsman
   Dropped obsolete InvocationHandler reference and injectable interface stuff.