Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

68139: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67630: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67523 : MNT-11104 : Admin Console:Search service. Setting wrong SSL port makes search admin console unavailable
            - Catch IAE to prevent 500 status returning


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:14:49 +00:00
parent a701724cb9
commit 752c4fb038

View File

@@ -217,6 +217,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
{
return "Unavailable: " + e.getMessage();
}
catch (IllegalArgumentException iae)
{
return "Unavailable: " + iae.getMessage();
}
}
else
{