Merge branch 'master' into pst-bachelor

src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java

@@ -172,7 +172,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 					return;
 				}
 				case Trace.CLAZZ_ID: {
-					if (buffer.remaining() >= 9) {
+					if (buffer.remaining() >= Trace.BYTE_LENGTH) {
 						final byte validByte = buffer.get();
 						boolean valid = true;
 						if (validByte == (byte) 0) {
@@ -180,15 +180,13 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec
 						}
 						final int eventsLength = buffer.getInt();
 						final int byteLength = buffer.getInt();
-						if (buffer.remaining() >= byteLength) {
+						if ((buffer.remaining() >= byteLength) && (eventsLength > 0)) {
 							final List<AbstractEventRecord> events = new ArrayList<AbstractEventRecord>(
 									eventsLength);
 							for (int i = 0; i < eventsLength; i++) {
-								AbstractEventRecord eventRecord;
 								try {
-									eventRecord = AbstractEventRecord.createFromByteBuffer(buffer,
-											stringRegistry);
-									events.add(eventRecord);
+									events.add(AbstractEventRecord.createFromByteBuffer(buffer,
+											stringRegistry));
 								} catch (final IdNotAvailableException e) {
 									// should not happen
 									e.printStackTrace();