db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb/src/test/org/apache/ojb/p6spy CountLogger.java
Date Tue, 30 Dec 2003 16:15:30 GMT
thma        2003/12/30 08:15:30

  Modified:    src/test/org/apache/ojb/broker/sqlcount Tag: OJB_BRANCH_1_0
                        CollectionCountTest.java
               src/test/org/apache/ojb Tag: OJB_BRANCH_1_0
                        repository_junit.xml
               src/test/org/apache/ojb/broker/metadata Tag: OJB_BRANCH_1_0
                        MetadataMultithreadedTest.java
               src/test/org/apache/ojb/p6spy Tag: OJB_BRANCH_1_0
                        CountLogger.java
  Log:
  merge from head
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.6.2.3   +4 -2      db-ojb/src/test/org/apache/ojb/broker/sqlcount/CollectionCountTest.java
  
  Index: CollectionCountTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/sqlcount/CollectionCountTest.java,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- CollectionCountTest.java	25 Dec 2003 21:34:34 -0000	1.6.2.2
  +++ CollectionCountTest.java	30 Dec 2003 16:15:30 -0000	1.6.2.3
  @@ -11,6 +11,7 @@
   import java.util.Iterator;
   import java.util.List;
   
  +import org.apache.ojb.broker.*;
   import org.apache.ojb.broker.Article;
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.InterfaceArticle;
  @@ -174,6 +175,7 @@
       assertStmtCount("insert second Person, singleton collection.", 6);
     }
     
  +  
     public void testPrefetched()
     {  
         ClassDescriptor cldProductGroup = myPB.getClassDescriptor(ProductGroup.class);
  @@ -192,7 +194,7 @@
         resetStmtCount();
         myPB.clearCache();
         
  -      
  +     
         myPB.beginTransaction();
         
         Criteria crit = new Criteria();
  
  
  
  No                   revision
  No                   revision
  1.102.2.2 +0 -0      db-ojb/src/test/org/apache/ojb/repository_junit.xml
  
  Index: repository_junit.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml,v
  retrieving revision 1.102.2.1
  retrieving revision 1.102.2.2
  diff -u -r1.102.2.1 -r1.102.2.2
  
  
  
  No                   revision
  No                   revision
  1.3.2.2   +0 -0      db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java
  
  Index: MetadataMultithreadedTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  
  
  
  No                   revision
  No                   revision
  1.3.2.2   +10 -10    db-ojb/src/test/org/apache/ojb/p6spy/CountLogger.java
  
  Index: CountLogger.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/p6spy/CountLogger.java,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- CountLogger.java	23 Dec 2003 09:55:50 -0000	1.3.2.1
  +++ CountLogger.java	30 Dec 2003 16:15:30 -0000	1.3.2.2
  @@ -35,14 +35,14 @@
      * @see com.p6spy.engine.logging.appender.FormattedLogger#logSQL
      */
     public void logSQL(int i, String s, long l, String s1, String s2, String s3)
  -  {
  -      if (s1.equals("resultset"))
  -      {
  -          // BRJ: p6spy workaround 
  -          // resultset cannot be excluded using p6spy properties
  -          return;
  -      }
  -      
  +  {  
  +    if (s1.equals("resultset"))
  +    {
  +        // BRJ: p6spy workaround 
  +        // resultset cannot be excluded using p6spy properties
  +        return;
  +    }
  +    
       super.logSQL(i, s, l, s1, s2, s3);
       countSQL++;
       logger.info("sql: " + s1 + "|" + s3);
  
  
  

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


Mime
View raw message