[jBoss-Dev] CVS update:contrib/castorjdo/src/main/org/jboss/jdo/castor CastorJDOImpl.java

[jBoss CVS Development]

  User: oleg    
  Date: 00/12/06 03:08:29

  Modified:    castorjdo/src/main/org/jboss/jdo/castor CastorJDOImpl.java
  Log:
  BugFix: on startup error NullPointerException was thrown
  
  Revision  Changes    Path
  1.7       +9 -12     
contrib/castorjdo/src/main/org/jboss/jdo/castor/CastorJDOImpl.java
  
  Index: CastorJDOImpl.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/contrib/castorjdo/src/main/org/jboss/jdo/castor/CastorJDOImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CastorJDOImpl.java        2000/11/10 13:18:22     1.6
  +++ CastorJDOImpl.java        2000/12/06 11:08:28     1.7
  @@ -50,7 +50,7 @@
    *   Castor JDO support
    *
    *   @author Oleg Nitz ([EMAIL PROTECTED])
  - *   @version $Revision: 1.6 $
  + *   @version $Revision: 1.7 $
    */
   public class CastorJDOImpl extends ServiceMBeanSupport 
           implements DataObjects, ObjectFactory, Referenceable, Serializable,
  @@ -76,12 +76,13 @@
           // Instance being used as ObjectFactory
       }
      
  -    public CastorJDOImpl(String dbConf, String jndiName, Integer lockTimeout, 
Boolean logging) {
  +    public CastorJDOImpl(String dbConf, String jndiName, Integer lockTimeout, 
Boolean logging)
  +            throws Exception {
           this(dbConf, jndiName, lockTimeout, logging, Boolean.FALSE);
       }
      
       public CastorJDOImpl(String dbConf, String jndiName, Integer lockTimeout,
  -                         Boolean logging, Boolean sameClassLoader) {
  +                         Boolean logging, Boolean sameClassLoader) throws Exception 
{
           org.exolab.castor.jdo.conf.Database database;
           Unmarshaller unm;
           int pos;
  @@ -90,15 +91,11 @@
           _jndiName = jndiName;
           _jdo.setTransactionManager("java:/TransactionManager");
           _jdo.setConfiguration(dbConf);
  -        try {
  -            unm = new Unmarshaller(org.exolab.castor.jdo.conf.Database.class);
  -            database = (org.exolab.castor.jdo.conf.Database) unm.unmarshal(new 
InputSource(dbConf));
  -            _jdo.setDatabaseName(database.getName());
  -            if (database.getJndi() != null) {
  -                _dataSourceName = database.getJndi().getName();
  -            }
  -        } catch (Exception ex) {
  -            log.error("Cannot read " + dbConf + ": " + ex);
  +        unm = new Unmarshaller(org.exolab.castor.jdo.conf.Database.class);
  +        database = (org.exolab.castor.jdo.conf.Database) unm.unmarshal(new 
InputSource(dbConf));
  +        _jdo.setDatabaseName(database.getName());
  +        if (database.getJndi() != null) {
  +            _dataSourceName = database.getJndi().getName();
           }
           if (lockTimeout != null) {
               timeout = lockTimeout.intValue();