From 752c4fb038825cb3fd89a29fd5f7b345165e9578 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:14:49 +0000
Subject: [PATCH] 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
---
 .../search/impl/solr/SolrChildApplicationContextFactory.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
index 7f21a1538e..04ccbce98d 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
@@ -217,6 +217,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
             {
                 return "Unavailable: " + e.getMessage();
             }
+            catch (IllegalArgumentException iae)
+            {
+                return "Unavailable: " + iae.getMessage();
+            }
         }
         else
         {