You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2005/01/27 01:11:18 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/broker/core MtoNBroker.java

arminw      2005/01/26 16:11:18

  Modified:    src/java/org/apache/ojb/broker/accesslayer Tag:
                        OJB_1_0_RELEASE ConnectionManagerImpl.java
               src/java/org/apache/ojb/broker/core Tag: OJB_1_0_RELEASE
                        MtoNBroker.java
  Log:
  fix javadoc, minor refactoring
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.17.2.2  +3 -1      db-ojb/src/java/org/apache/ojb/broker/accesslayer/ConnectionManagerImpl.java
  
  Index: ConnectionManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/ConnectionManagerImpl.java,v
  retrieving revision 1.17.2.1
  retrieving revision 1.17.2.2
  diff -u -r1.17.2.1 -r1.17.2.2
  --- ConnectionManagerImpl.java	16 Nov 2004 17:44:44 -0000	1.17.2.1
  +++ ConnectionManagerImpl.java	27 Jan 2005 00:11:17 -0000	1.17.2.2
  @@ -107,6 +107,8 @@
           /*
           if the connection is not null and we are not in a local tx, we check
           the connection state and release "dead" connections.
  +        if connection is in local tx we do nothing, the dead connection will cause
  +        an exception and PB instance have to handle rollback
           */
           if(con != null && !isInLocalTransaction() && !isAlive(con))
           {
  
  
  
  No                   revision
  No                   revision
  1.10.2.4  +2 -1      db-ojb/src/java/org/apache/ojb/broker/core/MtoNBroker.java
  
  Index: MtoNBroker.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/MtoNBroker.java,v
  retrieving revision 1.10.2.3
  retrieving revision 1.10.2.4
  diff -u -r1.10.2.3 -r1.10.2.4
  --- MtoNBroker.java	22 Jan 2005 20:51:14 -0000	1.10.2.3
  +++ MtoNBroker.java	27 Jan 2005 00:11:18 -0000	1.10.2.4
  @@ -272,6 +272,7 @@
           {
               //TODO: to be implemented, must change MtoNImplementor
               //deleteMtoNImplementor(wanted,leftObject) || deleteMtoNImplementor(wanted,rightObject)
  +            log.error("Can't handle MtoNImplementor in correct way, found a 'null' object");
           }
           else
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org