[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar  4 12:24:29 2013
New Revision: 1058

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1058&view=rev
Log:
SC-184: Trap exceptions during LDAP connector pool inititalization

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1058&r1=1057&r2=1058&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Mar  4 12:24:29 2013
@@ -1,6 +1,7 @@
 Changes in Release 1.4.0
 =============================================
 [SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
+[SC-184] - Trap exceptions during LDAP connector pool inititalization
 [SC-186] -  AttributeInMetadata rule for the attribute filter (copied back from uApprove)
 [SIDP-559] - Attribute queries are ignoring input designators
 [JOST-200] - Reduce memory usage of unit tests

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java?rev=1058&r1=1057&r2=1058&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/attribute/resolver/dataConnector/LdapDataConnectorFactoryBean.java Mon Mar  4 12:24:29 2013
@@ -147,7 +147,11 @@
             }
         }
 
-        setupPoolStrategy();
+        try {
+            setupPoolStrategy();
+        } catch (Exception e) {
+            logger.error("LDAP pool failed to initialize", e);
+        }
         
         LdapDataConnector connector = new LdapDataConnector(ldapPoolStrategy, resultsCache);
         populateDataConnector(connector);