Added exception class name to error sting when creating shireExceptions.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@247 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java b/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java
index 868d0fc..1b0f0c3 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java
@@ -171,20 +171,20 @@ public class ShireServlet extends HttpServlet {
                        log.info("Completed SHIRE initialization");
 
                } catch (OriginSiteMapperException e) {
-                       log.fatal("Unable load shibboleth site information." + e.getMessage());
-                       throw new UnavailableException("Unable load shibboleth site information." + e.getMessage());
+                       log.fatal("Unable load shibboleth site information." + e);
+                       throw new UnavailableException("Unable load shibboleth site information." + e);
                } catch (KeyStoreException e) {
-                       log.fatal("Unable supplied keystore." + e.getMessage());
-                       throw new UnavailableException("Unable load supplied keystore." + e.getMessage());
+                       log.fatal("Unable supplied keystore." + e);
+                       throw new UnavailableException("Unable load supplied keystore." + e);
                } catch (NoSuchAlgorithmException e) {
-                       log.fatal("Unable supplied keystore." + e.getMessage());
-                       throw new UnavailableException("Unable load supplied keystore." + e.getMessage());
+                       log.fatal("Unable supplied keystore." + e);
+                       throw new UnavailableException("Unable load supplied keystore." + e);
                } catch (CertificateException e) {
-                       log.fatal("Unable supplied keystore." + e.getMessage());
-                       throw new UnavailableException("Unable load supplied keystore." + e.getMessage());
+                       log.fatal("Unable supplied keystore." + e);
+                       throw new UnavailableException("Unable load supplied keystore." + e);
                } catch (IOException e) {
-                       log.fatal("Unable supplied keystore." + e.getMessage());
-                       throw new UnavailableException("Unable load supplied keystore." + e.getMessage());
+                       log.fatal("Unable supplied keystore." + e);
+                       throw new UnavailableException("Unable load supplied keystore." + e);
                }
 
        }
@@ -344,7 +344,7 @@ public class ShireServlet extends HttpServlet {
                        return s;
 
                } catch (SAMLException e) {
-                       throw new ShireException("Error processing SAML assertion: " + e.getMessage());
+                       throw new ShireException("Error processing SAML assertion: " + e);
                }
        }
 
@@ -403,7 +403,7 @@ public class ShireServlet extends HttpServlet {
 
                } catch (IOException e) {
                        throw new ShireException(
-                               "Unable to write session to file (" + filename + ") : " + e.getMessage());
+                               "Unable to write session to file (" + filename + ") : " + e);
                }
        }
 
@@ -438,9 +438,9 @@ public class ShireServlet extends HttpServlet {
         */
 
        private void handleError(ShireException se, HttpServletRequest req, HttpServletResponse res) {
-               log.error(se.getMessage());
+               log.error(se);
                log.debug("Displaying error page.");
-               req.setAttribute("errorText", se.getMessage());
+               req.setAttribute("errorText", se.toString());
                req.setAttribute("requestURL", req.getRequestURI().toString());
                RequestDispatcher rd = req.getRequestDispatcher("/wayferror.jsp");
 

diff --git a/src/edu/internet2/middleware/shibboleth/shire/XMLOriginSiteMapper.java b/src/edu/internet2/middleware/shibboleth/shire/XMLOriginSiteMapper.java
index e935826..8e2c22a 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/shire/XMLOriginSiteMapper.java
+++ b/src/edu/internet2/middleware/shibboleth/shire/XMLOriginSiteMapper.java
@@ -209,11 +209,11 @@ public class XMLOriginSiteMapper implements OriginSiteMapper {
                        }
                        throw new OriginSiteMapperException("Unable to verify signature on registry file: no signature found.");
                } catch (SAXException e) {
-                       throw new OriginSiteMapperException("Problem parsing site configuration" + e.getMessage());
+                       throw new OriginSiteMapperException("Problem parsing site configuration" + e);
                } catch (IOException e) {
-                       throw new OriginSiteMapperException("Problem accessing site configuration" + e.getMessage());
+                       throw new OriginSiteMapperException("Problem accessing site configuration" + e);
                } catch (ParserConfigurationException pce) {
-                       throw new OriginSiteMapperException("Parser configuration error" + pce.getMessage());
+                       throw new OriginSiteMapperException("Parser configuration error" + pce);
                } finally {
                        if (builder != null)
                                org.opensaml.XML.parserPool.put(builder);