[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolve...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 13 23:16:43 2015
New Revision: 7995

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7995&view=rev
Log:
IDP-700 - Implement specialized result set exceptions in parity with LDAP

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java?rev=7995&r1=7994&r2=7995&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/StringResultMappingStrategy.java	Fri Nov 13 23:16:43 2015
@@ -32,6 +32,8 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.resolver.MultipleResultAnErrorResolutionException;
+import net.shibboleth.idp.attribute.resolver.NoResultAnErrorResolutionException;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.dc.AbstractMappingStrategy;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -58,7 +60,7 @@
             if (!results.next()) {
                 log.debug("Result set did not contain any rows, nothing to map");
                 if (isNoResultAnError()) {
-                    throw new ResolutionException("No rows returned from query");
+                    throw new NoResultAnErrorResolutionException("No rows returned from query");
                 }
                 return null;
             }
@@ -73,7 +75,7 @@
             do {
                 rowCount++;
                 if (rowCount > 1 && isMultipleResultsAnError()) {
-                    throw new ResolutionException("Multiple rows returned from query");
+                    throw new MultipleResultAnErrorResolutionException("Multiple rows returned from query");
                 }
                 for (int i = 1; i <= resultMetadata.getColumnCount(); i++) {