[Jpox-commits] JPOX/Core/src/java/org/jpox/store/query ForwardQueryResult.java,1.10,1.11 InsensitiveQueryResult.java,1.12,1.13

[Andy J. <and...@us...>]

Update of /cvsroot/jpox/JPOX/Core/src/java/org/jpox/store/query
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11849/src/java/org/jpox/store/query

Modified Files:
	ForwardQueryResult.java InsensitiveQueryResult.java 
Log Message:
Added extension to allow turning off of "loadResultsAtCommit"

Index: ForwardQueryResult.java
===================================================================
RCS file: /cvsroot/jpox/JPOX/Core/src/java/org/jpox/store/query/ForwardQueryResult.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ForwardQueryResult.java	30 Dec 2005 15:40:08 -0000	1.10
--- ForwardQueryResult.java	30 Dec 2005 18:34:45 -0000	1.11
***************
*** 85,89 ****
          else if (fetchSize > 0)
          {
!             // TODO Support fetchSize with positive values
          }
      }
--- 85,92 ----
          else if (fetchSize > 0)
          {
!             for (int i=0;i<fetchSize;i++)
!             {
!                 nextResultSetElement();
!             }
          }
      }
***************
*** 142,151 ****
  
      /**
!      * Inform the query result that the connection is being closed so perform
       * any required operations now, or rest in peace.
       */
      public void closingConnection()
      {
!         if (isOpen() && moreResultSetRows)
          {
              try
--- 145,161 ----
  
      /**
!      * Method called to inform the query result that the connection is being closed so perform
       * any required operations now, or rest in peace.
       */
      public void closingConnection()
      {
!         boolean loadAllResults = true;
!         Object value = query.getExtension("org.jpox.query.loadResultsAtCommit");
!         if (value != null && ((String)value).equalsIgnoreCase("false"))
!         {
!             // User has turned off loading of results at commit
!             loadAllResults = false;
!         }
!         if (loadAllResults && isOpen() && moreResultSetRows)
          {
              try

Index: InsensitiveQueryResult.java
===================================================================
RCS file: /cvsroot/jpox/JPOX/Core/src/java/org/jpox/store/query/InsensitiveQueryResult.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** InsensitiveQueryResult.java	30 Dec 2005 15:40:08 -0000	1.12
--- InsensitiveQueryResult.java	30 Dec 2005 18:34:45 -0000	1.13
***************
*** 147,154 ****
      public void closingConnection()
      {
          // Make sure all rows are loaded.
!         for (int i=0;i<size();i++)
          {
!             getObjectForIndex(i);
          }
      }
--- 147,165 ----
      public void closingConnection()
      {
+         boolean loadAllResults = true;
+         Object value = query.getExtension("org.jpox.query.loadResultsAtCommit");
+         if (value != null && ((String)value).equalsIgnoreCase("false"))
+         {
+             // User has turned off loading of results at commit
+             loadAllResults = false;
+         }
+ 
          // Make sure all rows are loaded.
!         if (loadAllResults)
          {
!             for (int i=0;i<size();i++)
!             {
!                 getObjectForIndex(i);
!             }
          }
      }