[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj RowSecuredDBObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv17780/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	RowSecuredDBObject.java 
Log Message:
use localconnection, if available, to create permissions, in order to preserve transaction context, if any


Index: RowSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/RowSecuredDBObject.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** RowSecuredDBObject.java	7 May 2004 08:46:03 -0000	1.24
--- RowSecuredDBObject.java	10 May 2004 19:00:50 -0000	1.25
***************
*** 281,288 ****
  
          String primeKey = getKey();
!         RowPermissions rowPermissions = new RowPermissions(getJDBCMetaData()
!                 .getTargetTable(),
!                 primeKey);
          rowPermissions.setDataContext(getDataContext());
  
          boolean found = rowPermissions.find();
--- 281,290 ----
  
          String primeKey = getKey();
!         RowPermissions rowPermissions = new
!                 RowPermissions(getJDBCMetaData().getTargetTable(), primeKey);
          rowPermissions.setDataContext(getDataContext());
+         if (getLocalConnection() != null) {
+             rowPermissions.setConnection(getLocalConnection());
+         }
  
          boolean found = rowPermissions.find();
***************
*** 487,490 ****
--- 489,495 ----
                  getKey());
          rowGroupPerms.setDataContext(getDataContext());
+         if (getLocalConnection() != null) {
+             rowGroupPerms.setConnection(getLocalConnection());
+         }
          rowGroupPerms.group(group);
  
***************
*** 898,902 ****
          rowPermissions.owner(owner);
          rowPermissions.permissions(perm);
!         rowPermissions.addOrUpdate();
  
          if (group != null) {
--- 903,911 ----
          rowPermissions.owner(owner);
          rowPermissions.permissions(perm);
!         if (rowPermissions.find()) {
!             rowPermissions.update();
!         } else {
!             rowPermissions.add();
!         }
  
          if (group != null) {