db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/util BrokerHelper.java
Date Sun, 12 Jan 2003 14:29:08 GMT
arminw      2003/01/12 06:29:08

  Modified:    src/java/org/apache/ojb/broker/metadata
                        ConnectionRepository.java
               src/java/org/apache/ojb/broker/ta
                        PersistenceBrokerFactoryDefaultImpl.java
               src/java/org/apache/ojb/broker/util BrokerHelper.java
  Log:
  fix a bug in ConnectionRepository,
  add more log info,
  small fix in BrokerHelper for PBKey extraction
  from ODMG database name
  
  Revision  Changes    Path
  1.4       +3 -2      jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java
  
  Index: ConnectionRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConnectionRepository.java	9 Jan 2003 16:58:36 -0000	1.3
  +++ ConnectionRepository.java	12 Jan 2003 14:29:08 -0000	1.4
  @@ -46,6 +46,7 @@
                   result.setPassWord(pbKey.getPassword());
                   // this build connection descriptor could not be the default connection
                   result.setDefaultConnection(false);
  +                log.info("Automatic create of new jdbc-connection-descriptor for PBKey
"+pbKey);
                   addDescriptor(result);
               }
               else
  @@ -68,7 +69,7 @@
           while (it.hasNext())
           {
               jcd = (JdbcConnectionDescriptor) it.next();
  -            if(jcdAlias.equals(jcdAlias))
  +            if(jcdAlias.equals(jcd.getJcdAlias()))
               {
                   return (JdbcConnectionDescriptor) SerializationUtils.clone(jcd);
               }
  
  
  
  1.32      +3 -3      jakarta-ojb/src/java/org/apache/ojb/broker/ta/PersistenceBrokerFactoryDefaultImpl.java
  
  Index: PersistenceBrokerFactoryDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/ta/PersistenceBrokerFactoryDefaultImpl.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- PersistenceBrokerFactoryDefaultImpl.java	10 Jan 2003 17:04:34 -0000	1.31
  +++ PersistenceBrokerFactoryDefaultImpl.java	12 Jan 2003 14:29:08 -0000	1.32
  @@ -179,8 +179,8 @@
           if (log.isEnabledFor(Logger.INFO))
           {
               // only count created instances when INFO-Log-Level
  -            log.info("Create new PB instance, already created persistence broker instances:
" +
  -                    instanceCount);
  +            log.info("Create new PB instance for PBKey " + key +
  +                    ", already created persistence broker instances: " + instanceCount);
               // useful for testing
               ++this.instanceCount;
           }
  
  
  
  1.6       +2 -2      jakarta-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
  
  Index: BrokerHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BrokerHelper.java	9 Jan 2003 17:08:45 -0000	1.5
  +++ BrokerHelper.java	12 Jan 2003 14:29:08 -0000	1.6
  @@ -115,7 +115,7 @@
           }
           if (tok.hasMoreTokens())
           {
  -            passwd = tok.nextToken();
  +            if(user != null) passwd = tok.nextToken();
           }
           if(user != null && passwd == null)
           {
  
  
  

Mime
View raw message