Skip to content

Commit 870d275

Browse files
committed
remove throwers and catchers
1 parent 67cce53 commit 870d275

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoderPool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public CLASDecoderPool(int size, String variation, String timestamp) {
3434
}
3535
}
3636

37-
public CLASDecoder take() throws InterruptedException {
37+
public CLASDecoder take() {
3838
return pool.poll();
3939
}
4040

41-
public void put(CLASDecoder decoder) throws InterruptedException {
41+
public void put(CLASDecoder decoder) {
4242
pool.offer(decoder);
4343
}
4444

common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconMutil.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ void process(int thread) {
233233
t.setEventTag(1);
234234
Benchmark.getInstance().pause("serial");
235235
output.add(e);
236+
if (!t.isEmpty())
236237
output.add(t);
237238
}
238239
writeQueue.offer(output);
@@ -311,13 +312,9 @@ HipoDataEvent decode(ByteBuffer bytes) {
311312
EvioDataEvent evio = new EvioDataEvent(bytes.array(), ByteOrder.LITTLE_ENDIAN);
312313
Benchmark.getInstance().pause("evio");
313314
Benchmark.getInstance().resume("deco");
314-
HipoDataEvent hipo;
315-
try {
316-
CLASDecoder d = decoders.take();
317-
hipo = d.getDecodedDataEvenet(evio);
318-
decoders.put(d);
319-
}
320-
catch (InterruptedException ex) { hipo = null; }
315+
CLASDecoder d = decoders.take();
316+
HipoDataEvent hipo = d.getDecodedDataEvenet(evio);
317+
decoders.put(d);
321318
Benchmark.getInstance().pause("deco");
322319
return hipo;
323320
}

0 commit comments

Comments
 (0)