Merge pull request #6679 from vespa-engine/gjoranv/javacc-plugin

Gjoranv/javacc plugin

1 files changed, 2 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
index f44dab92fc7..08af2b02dea 100644
--- a/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
+++ b/container-search/src/main/java/com/yahoo/search/query/textserialize/TextSerialize.java
@@ -6,7 +6,7 @@ import com.yahoo.search.query.textserialize.item.ItemContext;
 import com.yahoo.search.query.textserialize.item.ItemFormHandler;
 import com.yahoo.search.query.textserialize.parser.ParseException;
 import com.yahoo.search.query.textserialize.parser.Parser;
-import com.yahoo.search.query.textserialize.parser.TokenMgrError;
+import com.yahoo.search.query.textserialize.parser.TokenMgrException;
 import com.yahoo.search.query.textserialize.serializer.QueryTreeSerializer;
 
 import java.io.StringReader;
@@ -28,9 +28,7 @@ public class TextSerialize {
                         "(type = " + result.getClass() + ")");
             }
             return (Item) result;
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        } catch (TokenMgrError e) {
+        } catch (ParseException | TokenMgrException e) {
             throw new RuntimeException(e);
         }
     }