directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-173 - 1.0.0-RC1 ldap api throws IOException
Date Wed, 29 Jun 2016 19:31:10 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 1c9b47223 -> c64af18c3


 FC-173 - 1.0.0-RC1 ldap api throws IOException


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/c64af18c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/c64af18c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/c64af18c

Branch: refs/heads/master
Commit: c64af18c3923bbfd203f25a2a6a6d02b28f7df5f
Parents: 1c9b472
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Jun 27 00:01:56 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Jun 27 00:01:56 2016 -0500

----------------------------------------------------------------------
 pom.xml                                           |  2 +-
 .../directory/fortress/core/impl/OrgUnitDAO.java  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c64af18c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32a1af2..09ac9f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <version.antlr>2.7.7</version.antlr>
     <version.apache.jdbm1>2.0.0-M3</version.apache.jdbm1>
     <version.apacheds>2.0.0-M21</version.apacheds>
-    <version.api.all>1.0.0-M33</version.api.all>
+    <version.api.all>1.0.0-RC1</version.api.all>
     <version.commons.beanutils>1.7.0</version.commons.beanutils>
     <version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
     <version.commons.codec>1.10</version.commons.codec>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c64af18c/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
index c1e4dc1..6b22495 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.core.impl;
 
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -536,6 +537,23 @@ final class OrgUnitDAO extends LdapDataProvider
 
             throw new FinderException( errCode, error, e );
         }
+        catch ( IOException e )
+        {
+            String error = "getOrgs type [" + orgUnit.getType() + "] root [" + orgUnitRoot
+                + "] caught IOException=" + e;
+            int errCode;
+
+            if ( orgUnit.getType() == OrgUnit.Type.PERM )
+            {
+                errCode = GlobalErrIds.ORG_GET_FAILED_PERM;
+            }
+            else
+            {
+                errCode = GlobalErrIds.ORG_GET_FAILED_USER;
+            }
+
+            throw new FinderException( errCode, error, e );
+        }
         finally
         {
             closeAdminConnection( ld );


Mime
View raw message