Skip to content
Snippets Groups Projects
Commit 990dc262 authored by Thorsten Vitt's avatar Thorsten Vitt
Browse files

Fixed NPE when AggregationTree is used for non-aggregations

parent 078e4c83
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.services</groupId>
<artifactId>aggregator</artifactId>
<version>1.4.4-SNAPSHOT</version>
<version>1.4.5-SNAPSHOT</version>
<packaging>war</packaging>
<name>TextGrid Aggregator Service</name>
......
......@@ -93,7 +93,7 @@ protected boolean walk(final ObjectType object, final boolean again) {
else {
Aggregation parent = stack.peek();
lastEntry = new AggregationEntry(object, parent);
if (parent.getMetadata().getEdition() != null &&
if (parent != null && parent.getMetadata().getEdition() != null &&
refersTo(parent.getMetadata().getEdition().getIsEditionOf(), object))
parent.setWork(lastEntry);
return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment