diff -u -r1.14 -r1.15
--- EvioFileProducer.java	3 May 2012 16:42:16 -0000	1.14
+++ EvioFileProducer.java	5 May 2012 19:17:16 -0000	1.15
@@ -28,7 +28,6 @@

     int group = 1;
     int size = 10000; // Default event size.
     int delay = 0;

-

     boolean debug = true;
 
     EvioFileProducer() {

@@ -155,30 +154,36 @@

             reader = new EvioReader(evioFileName);
 
             // Print number of events.

-            if (debug)
-                System.out.println("EVIO file opened with " + reader.getEventCount() + " events");

+            if (debug) {
+                System.out.println("EVIO file opened");
+            }

 
             // Event sequence number; starts with 1.
             int eventCount = 1;
 
             // Ref to current EVIO event.

-            EvioEvent event = null;

+            EvioEvent event;

 
             // Loop until event source is exhausted.

+            fileLoop:

             while (true) {
 
                 // Get next event.

-                try {
-                    event = reader.parseNextEvent();

+                event = reader.nextEvent();
+                if (event == null) {
+                    break fileLoop;

                 }

-                catch (Exception e) {

+                try {
+                    reader.parseEvent(event);
+                } catch (Exception e) {

                     e.printStackTrace();
                     System.out.println("Error making EVIO event with sequence number <" + eventCount + ">.");
                     continue;
                 }
 

-                if (debug)

+                if (debug) {

                     System.out.println("new events - size=" + size + "; group=" + group);

+                }

 
                 mevs = sys.newEvents(
                         att, // attachment

@@ -217,15 +222,10 @@

                 sys.putEvents(att, mevs);
 
                 if (debug) {

-                    System.out.println("Wrote event #" + eventCount + " to ET");                
-                    System.out.println("-------------------------------");                

+                    System.out.println("Wrote event #" + eventCount + " to ET");
+                    System.out.println("-------------------------------");

                     ++eventCount;
                 }

-
-                // Break if no more events.
-                if (reader.getNumEventsRemaining() == 0) {
-                    break;
-                }

             }
 
             // Cleanup.