You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2020/03/26 07:44:20 UTC
[directory-server] branch master updated: Fixing checkstyle +
re-enabling a test
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
The following commit(s) were added to refs/heads/master by this push:
new 76d9a24 Fixing checkstyle + re-enabling a test
76d9a24 is described below
commit 76d9a24a51e0f8f4f83996fd6e17b15c76f4196d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Mar 26 07:43:55 2020 +0000
Fixing checkstyle + re-enabling a test
---
.../java/org/apache/directory/server/core/DefaultOperationManager.java | 2 +-
.../directory/shared/client/api/operations/ClientDeleteRequestTest.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java b/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
index 0e091a0..bc57b69 100644
--- a/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
+++ b/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
@@ -664,7 +664,7 @@ public class DefaultOperationManager implements OperationManager
}
- private void deleteEntry( DeleteOperationContext deleteContext , Dn dn ) throws LdapException
+ private void deleteEntry( DeleteOperationContext deleteContext, Dn dn ) throws LdapException
{
DeleteOperationContext entryDeleteContext =
new DeleteOperationContext( deleteContext.getSession(), dn );
diff --git a/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java b/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
index 50aed5e..40cc804 100644
--- a/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
+++ b/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
@@ -136,7 +136,6 @@ public class ClientDeleteRequestTest extends AbstractLdapTestUnit
@Test
- @org.junit.Ignore // See DIRSERVER-2305
public void testDeleteWithCascadeControl() throws Exception
{
assertTrue( session.exists( "cn=parent,ou=system" ) );
@@ -224,7 +223,6 @@ public class ClientDeleteRequestTest extends AbstractLdapTestUnit
@Test
- //@org.junit.Ignore // See DIRSERVER-2305
public void testDeleteWithControl() throws Exception
{
assertTrue( session.exists( "cn=parent,ou=system" ) );