directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 20777 - in incubator/directory/rms/trunk: api/src/java/org/apache/rms je/src/java/org/apache/rms/je/profile
Date Thu, 03 Jun 2004 15:54:23 GMT
Author: akarasulu
Date: Thu Jun  3 08:54:22 2004
New Revision: 20777

Modified:
   incubator/directory/rms/trunk/api/src/java/org/apache/rms/DefaultApplication.java
   incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/JeProfileRoleLinkDAO.java
Log:
I think there are some changes between collections 3.1 and 3.1-dev

Modified: incubator/directory/rms/trunk/api/src/java/org/apache/rms/DefaultApplication.java
==============================================================================
--- incubator/directory/rms/trunk/api/src/java/org/apache/rms/DefaultApplication.java	(original)
+++ incubator/directory/rms/trunk/api/src/java/org/apache/rms/DefaultApplication.java	Thu
Jun  3 08:54:22 2004
@@ -441,7 +441,7 @@
             {
                 String oldName = ( String ) arg ;
 
-                synchronized ( m_perms ) 
+                synchronized ( m_perms )
                 {
                     m_perms.remove( oldName ) ;
                     m_perms.put( perm.getName(), perm ) ;
@@ -452,7 +452,7 @@
         {
             Role role = ( Role ) o ;
             
-            // we have a permission name change
+            // we have a role name change
             if ( arg instanceof String )                
             {
                 String oldName = ( String ) arg ;

Modified: incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/JeProfileRoleLinkDAO.java
==============================================================================
--- incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/JeProfileRoleLinkDAO.java
(original)
+++ incubator/directory/rms/trunk/je/src/java/org/apache/rms/je/profile/JeProfileRoleLinkDAO.java
Thu Jun  3 08:54:22 2004
@@ -19,19 +19,19 @@
 
 import org.apache.rms.je.JeUtils ;
 import org.apache.rms.RmsException ;
-import org.apache.rms.spi.ProfileRoleLinkDAO;
-import org.apache.rms.spi.ProfileRoleLinkDAOMonitor;
-import org.apache.rms.spi.ProfileRoleLinkDAOMonitorAdapter;
+import org.apache.rms.spi.ProfileRoleLinkDAO ;
+import org.apache.rms.spi.ProfileRoleLinkDAOMonitor ;
+import org.apache.rms.spi.ProfileRoleLinkDAOMonitorAdapter ;
+
 import org.apache.rms.je.JeJoinIterator ;
 import org.apache.rms.je.JeRmsException ;
-import org.apache.rms.je.LoggingJeIteratorMonitor;
 import org.apache.rms.je.sequence.Sequence ;
+import org.apache.rms.je.LoggingJeIteratorMonitor ;
 
 import org.apache.commons.lang.Validate ;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.iterators.EmptyIterator;
+import org.apache.commons.collections.IteratorUtils ;
 
-import java.util.*;
+import java.util.* ;
 
 import java.io.IOException ;
 import java.io.UnsupportedEncodingException ;
@@ -564,7 +564,7 @@
                 closeNoError( cursor ) ;
                 closeNoError( appNameCursor ) ;
                 closeNoError( userNameCursor ) ;
-                return EmptyIterator.INSTANCE ;
+                return IteratorUtils.EMPTY_ITERATOR ;
             }
 
             if ( status != OperationStatus.SUCCESS )
@@ -587,7 +587,7 @@
                 closeNoError( cursor ) ;
                 closeNoError( appNameCursor ) ;
                 closeNoError( userNameCursor ) ;
-                return EmptyIterator.INSTANCE ;
+                return IteratorUtils.EMPTY_ITERATOR ;
             }
 
             if ( status != OperationStatus.SUCCESS )

Mime
View raw message