svn commit: r700730 - in /lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac: attr/impl/AttributeManagerImpl.java shibboleth/ShibbolethAuthenticator.java

Author: andreas
Date: Wed Oct  1 03:30:48 2008
New Revision: 700730

URL: http://svn.apache.org/viewvc?rev=700730&view=rev
Log:
Improved traceability of attribute-set-releated authenticator issues.

Modified:
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/attr/impl/AttributeManagerImpl.java
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java

Modified: lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/attr/impl/AttributeManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/attr/impl/AttributeManagerImpl.java?rev=700730&r1=700729&r2=700730&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/attr/impl/AttributeManagerImpl.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/attr/impl/AttributeManagerImpl.java Wed Oct  1 03:30:48 2008
@@ -52,7 +52,7 @@
             try {
                 attrs = (AttributeSet) this.attrSetSelector.select(name);
             } catch (ServiceException e) {
-                throw new RuntimeException();
+                throw new RuntimeException(e);
             }
             this.name2attributeSet.put(name, attrs);
         }

Modified: lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java?rev=700730&r1=700729&r2=700730&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/shibboleth/ShibbolethAuthenticator.java Wed Oct  1 03:30:48 2008
@@ -494,6 +494,10 @@
 
     public AttributeSet getAttributeSet() {
         if (this.attributeSet == null) {
+            if (this.attributeSetHint == null) {
+                throw new RuntimeException("The parameter 'attribute-set' was not set. "
+                        + "Please check $WEBAPP_HOME/WEB-INF/cocoon.xconf.");
+            }
             try {
                 this.attributeManager = (AttributeManager) this.manager.lookup(AttributeManager.ROLE);
                 this.attributeSet = this.attributeManager.getAttributeSet(this.attributeSetHint);