From c8ea3e6c3186ed4fd8fb4690e2fb58b34896aa79 Mon Sep 17 00:00:00 2001 From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Tue, 21 Jul 2015 09:47:27 +0300 Subject: [PATCH] Fixes --- BuildServer/lib/tasks/dotnetbuilderwrapper.js | 5 +++++ DotNetBuilder/Program.cs | 2 +- DotNetBuilder/Response.cs | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/BuildServer/lib/tasks/dotnetbuilderwrapper.js b/BuildServer/lib/tasks/dotnetbuilderwrapper.js index ca4e215..5808c42 100644 --- a/BuildServer/lib/tasks/dotnetbuilderwrapper.js +++ b/BuildServer/lib/tasks/dotnetbuilderwrapper.js @@ -28,6 +28,11 @@ module.exports = function (params, processor) { var report = JSON.parse(result); var messages = report.Messages; for (var i = 0; i < messages.length; i++) { + if (!messages[i]) { + processor.onError("Message is null"); + continue; + } + switch(messages[i].Type) { case "info": processor.onInfo(messages[i].Body); diff --git a/DotNetBuilder/Program.cs b/DotNetBuilder/Program.cs index 7f7a83c..944b35f 100644 --- a/DotNetBuilder/Program.cs +++ b/DotNetBuilder/Program.cs @@ -30,7 +30,7 @@ namespace MicroBuildServer.DotNetBuilder } catch (Exception e) { - return new Response { Messages = new[] { new Response.Message { Type = "error", Body = e.ToString() } } }; + return new Response { Messages = new[] { Response.Message.CreateError(e.ToString()) } }; } } diff --git a/DotNetBuilder/Response.cs b/DotNetBuilder/Response.cs index 32dad24..e344192 100644 --- a/DotNetBuilder/Response.cs +++ b/DotNetBuilder/Response.cs @@ -11,12 +11,12 @@ namespace MicroBuildServer.DotNetBuilder [Serializable] public class Message { - public string Type { get; set; } - public string Body { get; set; } + public string Type { get; private set; } + public string Body { get; private set; } public static Message CreateInfo(string body) { - return new Message {Type = "info", Body = body}; + return new Message { Type = "info", Body = body }; } public static Message CreateWarn(string body)