Skip to content

Merge #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-karpovich merged 4 commits into from
May 14, 2021
Merged

Merge #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f672721
Merge pull request #1 from epam/release-6
alex-karpovich May 10, 2021
3c07e79
[*] fix schema nullable
May 14, 2021
ad9e5c8
Merge branch 'main' of https://github.com/epam/TimeBaseCommons into main
May 14, 2021
3185c1b
[*] messages
May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rc/Deltix.Timebase.Messages/EPAM.Deltix.Timebase.Messages.Schema/RecordClassDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public virtual Boolean IsAbstract
/// Defines if current RecordClassDescriptor is content class.
/// </summary>
[SchemaElement(Name=null, Title=null, Description=null)]
[SchemaType(Encoding=null, IsNullable=false, DataType=SchemaDataType.Default, Minimum=null, Maximum=null, NestedTypes=new Type[0])]
[SchemaType(Encoding=null, IsNullable=true, DataType=SchemaDataType.Default, Minimum=null, Maximum=null, NestedTypes=new Type[0])]
public virtual Boolean IsContentClass
{
get
Expand Down
2 changes: 1 addition & 1 deletion messages/schema/EPAM/Deltix/Timebase/Messages/Schema/RecordClassDescriptor.lux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class RecordClassDescriptor : ClassDescriptor {

/// Defines if current RecordClassDescriptor is content class.
[SchemaElement]
[SchemaType(IsNullable=false)]
[SchemaType(IsNullable=true)]
Boolean IsContentClass;

/// List of fields of a class.
Expand Down
4 changes: 2 additions & 2 deletions messages/src/main/java/com/epam/deltix/timebase/messages/InstrumentMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ public long getNanoTime() {
}

/**
* Indicated that this message has defined point in time.
* Indicated that this message has defined nanoseconds component of the time.
*/
public boolean hasNanoTime() {
return timestamp != TIMESTAMP_UNKNOWN;
return nanoTime != 0;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion messages/src/main/java/com/epam/deltix/timebase/messages/schema/RecordClassDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void nullifyIsAbstract() {
*/
@SchemaElement
@SchemaType(
isNullable = false
isNullable = true
)
public boolean isContentClass() {
return isContentClass == 1;
Expand Down