cweb-cvs

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/om
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26710/src/java/org/CognitiveWeb/generic/core/om

Modified Files:
	ObjectManager.java 
Log Message:
working through changes to variable length text fields embedded within multi-field keys to support GOM and the sparse row store.

Index: ObjectManager.java
===================================================================
RCS file: /cvsroot/cweb/generic-native/src/java/org/CognitiveWeb/generic/core/om/ObjectManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ObjectManager.java	30 Nov 2007 21:54:05 -0000	1.11
--- ObjectManager.java	4 Dec 2007 20:30:41 -0000	1.12
***************
*** 778,782 ****
          obj.init( this, delegate.insert(container,obj) );
  
!         m_createCountThisTransaction++; // Collect statistics.
  
          removeClearedLazily();
--- 778,790 ----
          obj.init( this, delegate.insert(container,obj) );
  
!         if(m_nativeTransactionCounter==0) {
! 
!             delegate.commit();
!             
!         } else {
! 
!             m_createCountThisTransaction++; // Collect statistics.
! 
!         }
  
          removeClearedLazily();
***************
*** 807,811 ****
          _removeLazily.remove(new Long(oid));
  
!         m_removeCountThisTransaction++; // Collect statistics.
  
          removeClearedLazily();
--- 815,827 ----
          _removeLazily.remove(new Long(oid));
  
!         if(m_nativeTransactionCounter==0) {
! 
!             delegate.commit();
!             
!         } else {
! 
!             m_removeCountThisTransaction++; // Collect statistics.
!             
!         }
  
          removeClearedLazily();
***************
*** 1042,1046 ****
          delegate.update( obj );
  
!         m_updateCountThisTransaction++; // Collect statistics.
  		
      }
--- 1058,1070 ----
          delegate.update( obj );
  
!         if(m_nativeTransactionCounter==0) {
! 
!             delegate.commit();
!             
!         } else {
! 
!             m_updateCountThisTransaction++; // Collect statistics.
!             
!         }
  		
      }
***************
*** 1362,1376 ****
  		checkIfOpen();
  
! 		int counter = getNativeTransactionCounter();
! 
! 		if (counter > 0) {
  
! 			log.warn("Native transaction is open: counter=" + counter,
! 					new RuntimeException("Warning"));
  
! 		}
  
- 		try {
- 			commit(); // force commit.
  		}
  		finally {
--- 1386,1402 ----
  		checkIfOpen();
  
!         try {
  
!             int counter = getNativeTransactionCounter();
  
!     		if (counter > 0) {
!     
!     			log.warn("Native transaction is open: counter=" + counter,
!     					new RuntimeException("Warning"));
!     
!                 commit(); // force commit.
!     
!             }
  
  		}
  		finally {