commit 76d9a24a51e0f8f4f83996fd6e17b15c76f4196d
author Colm O hEigeartaigh <coheigea@apache.org> Thu Mar 26 07:43:55 2020 +0000
committer Colm O hEigeartaigh <coheigea@apache.org> Thu Mar 26 07:43:55 2020 +0000
tree 0a2aac51022660d15b38c56086812d67e7e6329a
parent ec6dd38f66aa3b8e83a66ece045d89af1fbabfd7

Fixing checkstyle + re-enabling a test

core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java

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 @@
     }
     
     
-    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 );

ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java

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 @@
 
 
     @Test
-    @org.junit.Ignore // See DIRSERVER-2305
     public void testDeleteWithCascadeControl() throws Exception
     {
         assertTrue( session.exists( "cn=parent,ou=system" ) );
@@ -224,7 +223,6 @@
 
 
     @Test
-    //@org.junit.Ignore // See DIRSERVER-2305
     public void testDeleteWithControl() throws Exception
     {
         assertTrue( session.exists( "cn=parent,ou=system" ) );