Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Commits
7dea663f
Verified
Commit
7dea663f
authored
1 year ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix NullPointerException when value is NULL in grpc serialization
parent
727d865e
No related branches found
No related tags found
2 merge requests
!103
Release 0.11.0
,
!98
F grpc null values
Pipeline
#39224
failed
1 year ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/caosdb/server/entity/Entity.java
+4
-3
4 additions, 3 deletions
src/main/java/org/caosdb/server/entity/Entity.java
src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java
+5
-2
5 additions, 2 deletions
...n/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java
with
9 additions
and
5 deletions
src/main/java/org/caosdb/server/entity/Entity.java
+
4
−
3
View file @
7dea663f
...
@@ -609,10 +609,11 @@ public abstract class Entity extends AbstractObservable implements EntityInterfa
...
@@ -609,10 +609,11 @@ public abstract class Entity extends AbstractObservable implements EntityInterfa
@Override
@Override
public
void
parseValue
()
throws
Message
{
public
void
parseValue
()
throws
Message
{
if
(!
this
.
isParsed
)
{
if
(
this
.
isParsed
)
{
this
.
isParsed
=
true
;
return
;
setValue
(
getDatatype
().
parseValue
(
getValue
()));
}
}
this
.
isParsed
=
true
;
if
(
getValue
()
!=
null
)
setValue
(
getDatatype
().
parseValue
(
getValue
()));
}
}
@Override
@Override
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/caosdb/server/grpc/CaosDBToGrpcConverters.java
+
5
−
2
View file @
7dea663f
...
@@ -298,6 +298,8 @@ public class CaosDBToGrpcConverters {
...
@@ -298,6 +298,8 @@ public class CaosDBToGrpcConverters {
}
else
if
(
value
instanceof
GenericValue
)
{
}
else
if
(
value
instanceof
GenericValue
)
{
return
convertGenericValue
((
GenericValue
)
value
);
return
convertGenericValue
((
GenericValue
)
value
);
}
else
if
(
value
==
null
)
{
return
ScalarValue
.
newBuilder
().
setSpecialValue
(
SpecialValue
.
SPECIAL_VALUE_UNSPECIFIED
);
}
}
return
null
;
return
null
;
}
}
...
@@ -735,8 +737,9 @@ public class CaosDBToGrpcConverters {
...
@@ -735,8 +737,9 @@ public class CaosDBToGrpcConverters {
result
=
getSelectedValue
(
s
.
getSubselection
(),
referenced_entity
);
result
=
getSelectedValue
(
s
.
getSubselection
(),
referenced_entity
);
}
else
if
(
v
instanceof
CollectionValue
)
{
}
else
if
(
v
instanceof
CollectionValue
)
{
for
(
Value
i
:
(
CollectionValue
)
v
)
{
for
(
Value
i
:
(
CollectionValue
)
v
)
{
if
(
i
instanceof
ReferenceValue
)
{
Value
wrapped
=
((
IndexedSingleValue
)
i
).
getWrapped
();
EntityInterface
referenced_entity
=
((
ReferenceValue
)
i
).
getEntity
();
if
(
wrapped
instanceof
ReferenceValue
)
{
EntityInterface
referenced_entity
=
((
ReferenceValue
)
wrapped
).
getEntity
();
result
=
getSelectedValue
(
s
.
getSubselection
(),
referenced_entity
);
result
=
getSelectedValue
(
s
.
getSubselection
(),
referenced_entity
);
results
.
add
(
result
);
results
.
add
(
result
);
}
else
{
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment