Author: [log in to unmask]
Date: Fri Jan 23 18:40:59 2015
New Revision: 1985
Log:
Add null pointer checks for adding record processors.
Modified:
java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java
Modified: java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeLoop.java Fri Jan 23 18:40:59 2015
@@ -315,18 +315,24 @@
evioAdapter.setStopOnEndRun(config.stopOnEndRun);
// Add EtEventProcessors to loop.
- for (EtEventProcessor processor : config.etProcessors) {
- etAdapter.addProcessor(processor);
+ if (etAdapter != null) {
+ for (EtEventProcessor processor : config.etProcessors) {
+ etAdapter.addProcessor(processor);
+ }
}
// Add EvioEventProcessors to loop.
- for (EvioEventProcessor processor : config.evioProcessors) {
- evioAdapter.addProcessor(processor);
+ if (evioAdapter != null) {
+ for (EvioEventProcessor processor : config.evioProcessors) {
+ evioAdapter.addProcessor(processor);
+ }
}
// Add Drivers to loop.
- for (Driver driver : config.drivers) {
- lcioAdapter.addDriver(driver);
+ if (lcioAdapter != null) {
+ for (Driver driver : config.drivers) {
+ lcioAdapter.addDriver(driver);
+ }
}
// Add CompositeLoopAdapter which should execute last.
|