Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kirill Likhodedov
2012-01-31 16:39:30 +04:00
@@ -497,7 +497,7 @@ public class CompileDriver {
break;
}
}
compileContext.putUserData(COMPILE_SERVER_BUILD_STATUS, status);
compileContext.putUserDataIfAbsent(COMPILE_SERVER_BUILD_STATUS, status);
break;
}
return eventType == JpsRemoteProto.Message.Response.BuildEvent.Type.BUILD_COMPLETED;
@@ -511,6 +511,7 @@ public class CompileDriver {
LOG.info(trace);
System.out.println(trace);
}
compileContext.putUserData(COMPILE_SERVER_BUILD_STATUS, ExitStatus.ERRORS);
}
@Override