[openejb-scm] openejb1/modules/core/src/java/org/openejb/resource/jdbc JdbcManagedConnectionFactory.java

[jlaskowski]

jlaskowski    2004/08/11 16:07:36

  Modified:    modules/core/src/java/org/openejb/resource/jdbc
                        JdbcManagedConnectionFactory.java
  Log:

  Avoid NullPointerException when openejb.home is not set (Ensure 
http://www.theserverside.com/articles/article.tss?l=ContainerDrivenTestingSeries&page=part2
 proper execution)
  
  Revision  Changes    Path
  1.5       +6 -2      
openejb1/modules/core/src/java/org/openejb/resource/jdbc/JdbcManagedConnectionFactory.java
  
  Index: JdbcManagedConnectionFactory.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/resource/jdbc/JdbcManagedConnectionFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JdbcManagedConnectionFactory.java 27 Jul 2004 17:42:49 -0000      1.4
  +++ JdbcManagedConnectionFactory.java 11 Aug 2004 20:07:36 -0000      1.5
  @@ -149,7 +149,11 @@
           java.sql.Connection physicalConn;
           String userDir = System.getProperty("user.dir");
           try{
  -            System.setProperty("user.dir",System.getProperty("openejb.home"));
  +            // @TODO: Why is it done?
  +            String openejbHome = System.getProperty("openejb.home");
  +            if (openejbHome != null) {
  +                System.setProperty("user.dir", openejbHome);
  +            }
               physicalConn = DriverManager.getConnection(jdbcUrl, 
rxInfo.getUserName(), rxInfo.getPassword());        
           }catch(java.sql.SQLException sqlE){
               EISSystemException eisse =  new EISSystemException("Could not obtain a 
physical JDBC connection from the DriverManager");