From 46a06d8486c8ab5b463f8b9996012d259b9ccbb0 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Mon, 1 Apr 2019 14:34:03 +0200
Subject: Allow destructive changes in manually deployed zones

---
 container-search/src/main/java/com/yahoo/search/query/Model.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'container-search')

diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index a874ed45e30..1a2dad49b84 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -156,7 +156,7 @@ public class Model implements Cloneable {
      * @see #setLocale(String)
      */
     public void setLanguage(String language) {
-        setLocale(language.replace("_", "-"));
+        //setLocale(language.replace("_", "-"));
     }
 
     /**
@@ -170,8 +170,8 @@ public class Model implements Cloneable {
     }
 
     /**
-     * <p>Explicitly sets the locale to be used during parsing. This method also calls {@link #setLanguage(Language)}
-     * with the corresponding {@link Language} instance.</p>
+     * Explicitly sets the locale to be used during parsing. This method also calls {@link #setLanguage(Language)}
+     * with the corresponding {@link Language} instance.
      *
      * @param locale the locale to set
      * @see #getLocale()
-- 
cgit v1.2.3