Skip to content

Commit ee23ecd

Browse files
committed
Fix NPE
1 parent e5d6d53 commit ee23ecd

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

stroom-core-client-widget/src/main/java/stroom/widget/customdatebox/client/DurationPicker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected void onUnload() {
5959

6060
@Override
6161
public SimpleDuration getValue() {
62-
return new SimpleDuration(time.getValue(), timeUnit.getValue());
62+
return SimpleDuration.builder().time(time.getValue()).timeUnit(timeUnit.getValue()).build();
6363
}
6464

6565
@Override

stroom-core/src/main/java/stroom/core/dataprocess/AbstractProcessorTaskExecutor.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public abstract class AbstractProcessorTaskExecutor implements ProcessorTaskExec
139139
private final InternalStatisticsReceiver internalStatisticsReceiver;
140140
private final VolumeGroupNameProvider volumeGroupNameProvider;
141141

142-
private Processor streamProcessor;
142+
private Processor processor;
143143
private ProcessorFilter processorFilter;
144144
private ProcessorTask processorTask;
145145
private Source streamSource;
@@ -198,7 +198,7 @@ public ProcessorResult exec(final TaskContext taskContext,
198198
final ProcessorFilter processorFilter,
199199
final ProcessorTask processorTask,
200200
final Source streamSource) {
201-
this.streamProcessor = processor;
201+
this.processor = processor;
202202
this.processorFilter = processorFilter;
203203
this.processorTask = processorTask;
204204
this.streamSource = streamSource;
@@ -302,8 +302,8 @@ private void process(final TaskContext taskContext) {
302302
// Set the pipeline so it can be used by a filter if needed.
303303
pipelineDoc = pipelineStore.readDocument(getProcessDecorator().getPipeline());
304304
if (pipelineDoc == null) {
305-
final String msg = "Pipeline " + streamProcessor.getPipelineUuid()
306-
+ " cannot be found for processor with id " + streamProcessor.getId();
305+
final String msg = "Pipeline " + processor.getPipelineUuid()
306+
+ " cannot be found for processor with id " + processor.getId();
307307
LOGGER.error(msg);
308308
throw new RuntimeException(msg);
309309
}
@@ -331,7 +331,7 @@ private void process(final TaskContext taskContext) {
331331
LOGGER.info(() -> processingInfo);
332332

333333
// Hold the source and feed so the pipeline filters can get them.
334-
streamProcessorHolder.setStreamProcessor(streamProcessor, processorTask);
334+
streamProcessorHolder.setStreamProcessor(processor, processorTask);
335335

336336
// Process the streams.
337337
final PipelineData pipelineData = pipelineDataCache.get(pipelineDoc);

stroom-util-shared/src/main/java/stroom/util/shared/time/SimpleDuration.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SimpleDuration {
2323
public SimpleDuration(@JsonProperty("time") final long time,
2424
@JsonProperty("timeUnit") final TimeUnit timeUnit) {
2525
this.time = time;
26-
this.timeUnit = timeUnit;
26+
this.timeUnit = timeUnit == null ? TimeUnit.DAYS : timeUnit;
2727
}
2828

2929
public long getTime() {
@@ -92,6 +92,9 @@ public Builder timeUnit(final TimeUnit timeUnit) {
9292
}
9393

9494
public SimpleDuration build() {
95+
if (timeUnit == null) {
96+
timeUnit = TimeUnit.DAYS;
97+
}
9598
return new SimpleDuration(time, timeUnit);
9699
}
97100
}

stroom-util/src/main/java/stroom/util/time/SimpleDurationUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static SimpleDuration parse(final String string) throws ParseException {
3838
default -> throw new ParseException("Time unit is invalid: " + trimmed, 0);
3939
};
4040

41-
return new SimpleDuration(time, timeUnit);
41+
return SimpleDuration.builder().time(time).timeUnit(timeUnit).build();
4242
} catch (final RuntimeException e) {
4343
throw new ParseException("Format of duration string is invalid: " + trimmed, 0);
4444
}

0 commit comments

Comments
 (0)