Fixed exception catch.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@101 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 ab6911c..6be5897 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java
+++ b/src/edu/internet2/middleware/shibboleth/shire/ShireServlet.java
@@ -113,10 +113,6 @@ public class ShireServlet extends HttpServlet
             }
             mapper = new XMLOriginSiteMapper(conf.getInitParameter("registry-uri"), k, ks);
         }
-        catch (org.apache.xml.security.exceptions.XMLSecurityException e)
-        {
-            throw new ServletException(e.getMessage());
-        }
         catch (java.security.KeyStoreException e)
         {
             throw new ServletException("ShireServlet.init() unable to load Java keystore");
@@ -137,7 +133,7 @@ public class ShireServlet extends HttpServlet
         {
             throw new ServletException("ShireServlet.init() unable to load Java keystore");
         }
-        catch (org.xml.sax.SAXException e)
+        catch (Exception e)
         {
             throw new ServletException("ShireServlet.init() unable to load origin site registry: " + e.getMessage());
         }