directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 10470 - in incubator/directory/rms/trunk/je/src/java/org/apache/rms/je: application permission role
Date Sat, 01 May 2004 03:09:51 GMT
Author: akarasulu
Date: Fri Apr 30 20:09:49 2004
New Revision: 10470

Modified:
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionDAO.java
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionIndexDAO.java
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/role/JeRoleDAO.java
Log:
Fixed some incorrect code in the closeNoError() methods of these DA objects


Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/application/JeApplicationDAO.java
Fri Apr 30 20:09:49 2004
@@ -406,7 +406,6 @@
     {
         if ( cursor == null )
         {
-            monitor.cleanedUp( this, "close", cursor ) ;
             return ;
         }
 
@@ -418,6 +417,8 @@
         {
             monitor.failedOnCleanupOperation( this, "close", cursor, e ) ;
         }
+
+        monitor.cleanedUp( this, "close", cursor ) ;
     }
 
 

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionDAO.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionDAO.java
Fri Apr 30 20:09:49 2004
@@ -924,7 +924,6 @@
     {
         if ( cursor == null )
         {
-            monitor.cleanedUp( this, "close", cursor ) ;
             return ;
         }
 
@@ -936,6 +935,8 @@
         {
             monitor.failedOnCleanupOperation( this, "close", cursor, e ) ;
         }
+        
+	monitor.cleanedUp( this, "close", cursor ) ;
     }
 
 
@@ -948,7 +949,6 @@
     {
         if ( cursor == null )
         {
-            monitor.cleanedUp( this, "close", cursor ) ;
             return ;
         }
 
@@ -960,6 +960,8 @@
         {
             monitor.failedOnCleanupOperation( this, "close", cursor, e ) ;
         }
+        
+	monitor.cleanedUp( this, "close", cursor ) ;
     }
 
 

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionIndexDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionIndexDAO.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/permission/JeBitPermissionIndexDAO.java
Fri Apr 30 20:09:49 2004
@@ -437,16 +437,18 @@
      */
     private void closeNoError( Cursor cursor )
     {
-        if ( cursor != null )
+        if ( cursor == null )
         {
-            try
-            {
-                cursor.close() ;
-            }
-            catch ( DatabaseException e )
-            {
-                monitor.closeFailure( this, cursor, e ) ;
-            }
+            return ;
+        }
+	
+        try
+        {
+            cursor.close() ;
+        }
+        catch ( DatabaseException e )
+        {
+            monitor.closeFailure( this, cursor, e ) ;
         }
 
         monitor.closeSuccess( this, cursor ) ;

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/role/JeRoleDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/role/JeRoleDAO.java	(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/role/JeRoleDAO.java	Fri Apr
30 20:09:49 2004
@@ -728,7 +728,6 @@
     {
         if ( cursor == null )
         {
-            monitor.cleanedUp( this, "close", cursor ) ;
             return ;
         }
 
@@ -740,6 +739,8 @@
         {
             monitor.failedOnCleanupOperation( this, "close", cursor, e ) ;
         }
+	
+        monitor.cleanedUp( this, "close", cursor ) ;
     }
 
 
@@ -752,7 +753,6 @@
     {
         if ( cursor == null )
         {
-            monitor.cleanedUp( this, "close", cursor ) ;
             return ;
         }
 
@@ -764,6 +764,8 @@
         {
             monitor.failedOnCleanupOperation( this, "close", cursor, e ) ;
         }
+
+        monitor.cleanedUp( this, "close", cursor ) ;
     }
 
 

Mime
View raw message