[jBoss-Dev] CVS update: jboss/src/main/org/jboss/jdbcJDBCDataSourceLoader.java XADataSourceLoader.java

[jBoss CVS Development]

  User: mulder  
  Date: 00/09/13 05:14:02

  Modified:    src/main/org/jboss/jdbc JDBCDataSourceLoader.java
                        XADataSourceLoader.java
  Log:
  More JavaDoc comment updates.
  Make sure the pools are unloaded correctly with the new names.
  
  Revision  Changes    Path
  1.5       +6 -3      jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java
  
  Index: JDBCDataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JDBCDataSourceLoader.java 2000/09/13 11:51:32     1.4
  +++ JDBCDataSourceLoader.java 2000/09/13 12:14:01     1.5
  @@ -25,7 +25,7 @@
   /**
    * Service that loads a JDBC 1 connection pool.  The constructors are called by
    * the JMX engine based on your MLET tags.
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class JDBCDataSourceLoader extends ServiceMBeanSupport implements 
JDBCDataSourceLoaderMBean {
  @@ -193,8 +193,11 @@
       public void stopService() {
           // Unbind from JNDI
           try {
  -            new InitialContext().unbind("jdbc."+source.getPoolName());
  -            log.log("JDBC Connection pool "+source.getPoolName()+" removed from 
JNDI");
  +            String name = source.getPoolName();
  +            new InitialContext().unbind(name);
  +            log.log("JDBC Connection pool "+name+" removed from JNDI");
  +            source.close();
  +            log.log("JDBC Connection pool "+name+" shut down");
           } catch (NamingException e) {
               // Ignore
           }
  
  
  
  1.9       +2 -2      jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java
  
  Index: XADataSourceLoader.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/jdbc/XADataSourceLoader.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XADataSourceLoader.java   2000/09/13 11:51:32     1.8
  +++ XADataSourceLoader.java   2000/09/13 12:14:01     1.9
  @@ -29,7 +29,7 @@
    * pool generates connections that are registered with the current Transaction
    * and support two-phase commit.  The constructors are called by the JMX engine
    * based on your MLET tags.
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XADataSourceLoader extends ServiceMBeanSupport
  @@ -246,7 +246,7 @@
           // Unbind from JNDI
           try {
               String name = source.getPoolName();
  -            new InitialContext().unbind("xa."+name);
  +            new InitialContext().unbind(name);
               log.log("XA Connection pool "+name+" removed from JNDI");
               source.close();
               log.log("XA Connection pool "+name+" shut down");