directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r392474 - /directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Date Sat, 08 Apr 2006 02:15:07 GMT
Author: akarasulu
Date: Fri Apr  7 19:15:05 2006
New Revision: 392474

URL: http://svn.apache.org/viewcvs?rev=392474&view=rev
Log:
merging bugfix on revision 392062 into trunk from apacheds 1.0 branch:

   http://svn.apache.org/viewcvs?rev=392062&view=rev


Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=392474&r1=392473&r2=392474&view=diff
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Fri Apr  7 19:15:05 2006
@@ -620,18 +620,8 @@
             {
                 for ( int ii = 0; ii < SUBENTRY_OPATTRS.length; ii++ )
                 {
-                    int op = DirContext.REPLACE_ATTRIBUTE;
-                    Attribute opAttr = entry.get( SUBENTRY_OPATTRS[ii] );
-                    if ( opAttr != null )
-                    {
-                        opAttr = ( Attribute ) opAttr.clone();
-                    }
-                    else
-                    {
-                        op = DirContext.ADD_ATTRIBUTE;
-                        opAttr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
-                    }
-
+                    int op = DirContext.ADD_ATTRIBUTE;
+                    Attribute opAttr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
                     opAttr.add( subentryDn );
                     modList.add( new ModificationItem( op, opAttr ) );
                 }



Mime
View raw message