Merge branch 'feature/KAA-1279' of github.com:Acarus/kaa into working

Conflicts: server/node/src/main/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java
kaaproject · Oct 1, 2016 · 1896f96 · 1896f96
1 parent 4c52f65
commit 1896f96
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ain/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java b/...ain/java/org/kaaproject/kaa/server/operations/service/logs/DefaultLogAppenderService.java
@@ -114,7 +114,7 @@ public LogSchema getLogSchema(String applicationId, int logSchemaVersion) {
     LogSchema logSchema = null;
     LogSchemaDto logSchemaDto = logSchemaService.findLogSchemaByAppIdAndVersion(
         applicationId, logSchemaVersion);
-    CTLSchemaDto ctlSchema = ctlService.findCTLSchemaById(logSchemaDto.getCtlSchemaId());
+    CTLSchemaDto ctlSchema = ctlService.findCtlSchemaById(logSchemaDto.getCtlSchemaId());
     String logFlatSchema = ctlService.flatExportAsString(ctlSchema);
     if (logSchemaDto != null) {
       logSchema = new LogSchema(logSchemaDto, logFlatSchema);