db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/singlevm PersistenceBrokerImpl.java
Date Mon, 09 Dec 2002 20:05:19 GMT
brj         2002/12/09 12:05:19

  Modified:    src/java/org/apache/ojb/broker/singlevm
                        PersistenceBrokerImpl.java
  Log:
  fixed bug with MtoNQueries (can't be extent aware)
  
  Revision  Changes    Path
  1.89      +22 -3     jakarta-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java
  
  Index: PersistenceBrokerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- PersistenceBrokerImpl.java	8 Dec 2002 13:28:44 -0000	1.88
  +++ PersistenceBrokerImpl.java	9 Dec 2002 20:05:19 -0000	1.89
  @@ -1584,7 +1584,16 @@
       {
           RsIteratorFactory factory = RsIteratorFactoryImpl.getInstance();
   
  -        return getRsIteratorFromQueryExtentAware(query, cld, factory);
  +        // BRJ: MtoNQueries can't be extent aware
  +        if (query instanceof MtoNQuery)
  +        {
  +            return getRsIteratorFromQuery(query, cld, factory);
  +        }
  +        else
  +        {
  +            return getRsIteratorFromQueryExtentAware(query, cld, factory);
  +        }    
  +        
       }
   
       /**
  @@ -2537,7 +2546,17 @@
       private OJBIterator getReportQueryIteratorFromQuery(Query query, ClassDescriptor cld)
throws PersistenceBrokerException
       {
           RsIteratorFactory factory = ReportRsIteratorFactoryImpl.getInstance();
  -        return getRsIteratorFromQueryExtentAware(query, cld, factory);
  +        
  +        // BRJ MtoNQueries can't be extent aware
  +        if (query instanceof MtoNQuery)
  +        {
  +            return getRsIteratorFromQuery(query, cld, factory);
  +        }
  +        else
  +        {
  +            return getRsIteratorFromQueryExtentAware(query, cld, factory);
  +        }    
  +            
       }
   
       /*
  
  
  

Mime
View raw message