Merge branch '2.0' into develop

2017-02-01 09:35:13 +02:00
parent 2b950e60fd a8780b8924
commit e64a641bcd
14 changed files with 314 additions and 78 deletions
--- a/server/modules/routing/avrorouter/avro_index.c
+++ b/server/modules/routing/avrorouter/avro_index.c
@ -73,6 +73,7 @@ int index_query_cb(void *data, int rows, char** values, char** names)
 void avro_index_file(AVRO_INSTANCE *router, const char* filename)
 {
    MAXAVRO_FILE *file = maxavro_file_open(filename);
+
    if (file)
    {
        char *name = strrchr(filename, '/');
@ -166,6 +167,10 @@ void avro_index_file(AVRO_INSTANCE *router, const char* filename)

        maxavro_file_close(file);
    }
+    else
+    {
+        MXS_ERROR("Failed to open file '%s' when generating file index.", filename);
+    }
 }

 /**