Do not halt when drules_proto.bin is absent. Reading drules_proto.txt.

1 files changed, 7 insertions, 14 deletions

diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 6b2d80026e..6c11be5646 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -68,26 +68,19 @@ namespace classificator
 
     try
     {
-      // Load from protobuffer binary file.
+      // Load from proto buffer binary file.
       ReaderStreamBuf buffer(p.GetReader(DRAWING_RULES_BIN_FILE));
 
       istream s(&buffer);
       rules.LoadFromBinaryProto(s);
     }
-    catch (Reader::OpenException const &)
+    catch (FileAbsentException const &)
     {
-      try
-      {
-        // Load from protobuffer text file.
-        string buffer;
-        ModelReaderPtr(p.GetReader(DRAWING_RULES_TXT_FILE)).ReadAsString(buffer);
-
-        rules.LoadFromTextProto(buffer);
-      }
-      catch (Reader::OpenException const &)
-      {
-        LOG(LERROR, ("No drawing rules found"));
-      }
+      // Load from proto buffer text file.
+      string buffer;
+      ModelReaderPtr(p.GetReader(DRAWING_RULES_TXT_FILE)).ReadAsString(buffer);
+
+      rules.LoadFromTextProto(buffer);
     }
 
     LOG(LINFO, ("Reading of classificator finished"));