From commits-return-22246-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Jul 21 22:18:11 2009 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 61474 invoked from network); 21 Jul 2009 22:18:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Jul 2009 22:18:11 -0000 Received: (qmail 66661 invoked by uid 500); 21 Jul 2009 22:19:16 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 66600 invoked by uid 500); 21 Jul 2009 22:19:16 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 66591 invoked by uid 99); 21 Jul 2009 22:19:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2009 22:19:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jul 2009 22:19:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 52CBC2388905; Tue, 21 Jul 2009 22:18:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r796568 - /directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java Date: Tue, 21 Jul 2009 22:18:52 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090721221852.52CBC2388905@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Tue Jul 21 22:18:51 2009 New Revision: 796568 URL: http://svn.apache.org/viewvc?rev=796568&view=rev Log: Fix for DIRSTUDIO-502 (Copy/Paste the context entry from one connection to another doesn't work) Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java?rev=796568&r1=796567&r2=796568&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java (original) +++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesJob.java Tue Jul 21 22:18:51 2009 @@ -218,9 +218,14 @@ entryToCopy.getBrowserConnection().getAliasesDereferencingMethod(), entryToCopy.getBrowserConnection().getReferralsHandlingMethod(), controls, monitor, null ); + // In case the parent is the RootDSE: use the parent DN of the old entry + LdapDN parentDn = parent.getDn(); + if ( parentDn.isEmpty() ) + { + parentDn = DnUtils.getParent( entryToCopy.getDn() ); + } numberOfCopiedEntries = copyEntryRecursive( entryToCopy.getBrowserConnection(), result, parent - .getBrowserConnection(), parent.getDn(), newRdn, scope, numberOfCopiedEntries, dialog, dummyMonitor, - monitor ); + .getBrowserConnection(), parentDn, newRdn, scope, numberOfCopiedEntries, dialog, dummyMonitor, monitor ); return numberOfCopiedEntries; }