From f422aaf88ec353ae76f45d5195aae4567236836d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 18 Sep 2014 17:19:22 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    83971:
 ALF-21100 - defensive code improvement around handing of invalid Search
 operator option.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/jscript/Search.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index 19593b7242..2f927ab3e7 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -670,9 +670,16 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
                 {
                     sp.setDefaultFieldName(defaultField);
                 }
-                if (defaultOperator != null)
+                if (defaultOperator != null && defaultOperator.length() != 0)
                 {
-                    sp.setDefaultOperator(Operator.valueOf(defaultOperator.toUpperCase()));
+                    try
+                    {
+                        sp.setDefaultOperator(Operator.valueOf(defaultOperator.toUpperCase()));
+                    }
+                    catch (IllegalArgumentException e)
+                    {
+                        // ignore invalid Operator and the default value will be used
+                    }
                 }
                 if (namespace != null)
                 {