From 0a8bb5961c7de1fb521d6760f41597c72c1a2b9c Mon Sep 17 00:00:00 2001
From: William Bourque <william.bourque@polymtl.ca>
Date: Wed, 14 Apr 2010 21:43:55 +0000
Subject: [PATCH] Fixed weird logic intruced in commit r24568

---
 .../lttng/event/LttngEventContent.java        | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
index 8530ca1757..3afb162ce4 100644
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java
@@ -155,24 +155,27 @@ public class LttngEventContent extends TmfEventContent {
      */
     @Override
     public synchronized LttngEventField[] getFields() {
-        
-        
         if ( fFieldsMap.size() < fParentEvent.getType().getNbFields() ) {
         	LttngEventField tmpField = null;
         	LttngEventType tmpType = (LttngEventType)fParentEvent.getType();
         	
 	        for ( int pos=0; pos<tmpType.getNbFields(); pos++ ) {
 	            String name = null;
-				try {
-					name = tmpType.getLabel(pos);
-				} catch (TmfNoSuchFieldException e) {
-				}
-	            JniEvent tmpEvent = ((LttngEvent)getEvent()).convertEventTmfToJni();
-	            
-	            if ( tmpEvent != null ) {
-		            Object newValue = tmpEvent.parseFieldByName(name);
-		            tmpField = new LttngEventField(this, name, newValue );
-		            fFieldsMap.put(name, tmpField);
+				JniEvent tmpEvent = ((LttngEvent)getEvent()).convertEventTmfToJni();
+				
+				// tmpEvent == null probably mean there is a discrepancy between Eclipse and C library
+				// An error was probably printed in convertEventTmfToJni() already, but keep in mind this is SERIOUS
+				if ( tmpEvent != null ) {
+					try {
+						name = tmpType.getLabel(pos);
+					
+						Object newValue = tmpEvent.parseFieldByName(name);
+						tmpField = new LttngEventField(this, name, newValue );
+						fFieldsMap.put(name, tmpField);
+					}
+					catch (TmfNoSuchFieldException e) {
+						System.out.println("Invalid field position requested : " + pos + ", ignoring (getFields).");
+					}
 	            }
 	        }
         }
@@ -192,13 +195,13 @@ public class LttngEventContent extends TmfEventContent {
         String label = null;
 		try {
 			label = fParentEvent.getType().getLabel(position);
-		} catch (TmfNoSuchFieldException e) {
+			
+			returnedField = this.getField(label);
+		} 
+		catch (TmfNoSuchFieldException e) {
+			System.out.println("Invalid field position requested : " + position + ", ignoring (getField).");
 		}
         
-        if ( label != null ) {
-            returnedField = this.getField(label);
-        }
-        
         return returnedField;
     }
     
-- 
2.34.1