Skip to content

Commit df450b8

Browse files
committed
add null checks
1 parent a24222a commit df450b8

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Processor.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,14 @@ private void processEventScalers(Bank runcfg, Bank recevt) {
200200
*/
201201
private void processEventUnix(Event event, Bank runcfg) {
202202
if (runcfg.getRows() > 0) {
203-
Integer unix = eventUnix.get(eventUnix.floorKey(runcfg.getInt("event",0)));
204-
if (unix != null) {
205-
event.remove(runcfg.getSchema());
206-
runcfg.putInt("unixtime", 0, unix);
207-
event.write(runcfg);
203+
Integer key = eventUnix.floorKey(runcfg.getInt("event",0));
204+
if (key != null) {
205+
Integer unix = eventUnix.get(key);
206+
if (unix != null) {
207+
event.remove(runcfg.getSchema());
208+
runcfg.putInt("unixtime", 0, unix);
209+
event.write(runcfg);
210+
}
208211
}
209212
}
210213
}

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Tag1ToEvent.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,14 @@ public static void main(String[] args) {
154154
// Update RUN::config.unixtime:
155155
if (runConfigBank.getRows() > 0) {
156156
int evno = runConfigBank.getByte("event", 0);
157-
Integer unix = eventUnix.get(eventUnix.floorKey(evno));
158-
if (unix != null) {
159-
event.remove(runConfigBank.getSchema());
160-
runConfigBank.putInt("unixtime", 0, unix);
161-
event.write(runConfigBank);
157+
Integer key = eventUnix.floorKey(evno);
158+
if (key != null) {
159+
Integer unix = eventUnix.get(key);
160+
if (unix != null) {
161+
event.remove(runConfigBank.getSchema());
162+
runConfigBank.putInt("unixtime", 0, unix);
163+
event.write(runConfigBank);
164+
}
162165
}
163166
}
164167

0 commit comments

Comments
 (0)