From 787bc247b983ce70fe27b5358077309af2fc984d Mon Sep 17 00:00:00 2001
From: Matthew Khouzam <matthew.khouzam@ericsson.com>
Date: Tue, 15 May 2012 15:00:04 -0400
Subject: [PATCH] Fix some findbugs

---
 .../eclipse/linuxtools/ctf/core/trace/CTFTrace.java    | 10 +++-------
 .../org/eclipse/linuxtools/ctf/parser/CTFLexer.java    |  2 +-
 .../org/eclipse/linuxtools/ctf/parser/CTFParser.java   |  6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
index 9317d55053..2a5a2b63c4 100644
--- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
+++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java
@@ -229,7 +229,7 @@ public class CTFTrace implements IDefinitionScope {
     }
 
     @Override
-    protected void finalize() {
+    protected void finalize() throws Throwable{
         /* If this trace gets closed, release the descriptors to the streams */
         for (FileChannel fc : streamFileChannels) {
             if (fc != null) {
@@ -240,11 +240,8 @@ public class CTFTrace implements IDefinitionScope {
                 }
             }
         }
-        try {
-            super.finalize();
-        } catch (Throwable e) {
-            // TODO Auto-generated catch block
-        }
+        super.finalize();
+
     }
 
     // ------------------------------------------------------------------------
@@ -516,7 +513,6 @@ public class CTFTrace implements IDefinitionScope {
             /* Check UUID */
             ArrayDefinition uuidDef = (ArrayDefinition) packetHeaderDef
                     .lookupDefinition("uuid"); //$NON-NLS-1$
-            assert ((uuidDef != null) && (uuidDef.getDeclaration().getLength() == Utils.UUID_LEN));
             if (uuidDef != null) {
                 byte[] uuidArray = new byte[Utils.UUID_LEN];
 
diff --git a/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFLexer.java b/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFLexer.java
index d1378687a0..d189dc7a8a 100644
--- a/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFLexer.java
+++ b/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFLexer.java
@@ -2546,7 +2546,7 @@ public class CTFLexer extends Lexer {
         }
     }
 
-    class DFA17 extends DFA {
+    static class DFA17 extends DFA {
 
         public DFA17(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
diff --git a/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFParser.java b/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFParser.java
index a2b3efa21f..03d9a393f3 100644
--- a/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFParser.java
+++ b/org.eclipse.linuxtools.ctf.parser/src/org/eclipse/linuxtools/ctf/parser/CTFParser.java
@@ -11028,7 +11028,7 @@ public class CTFParser extends Parser {
         }
     }
 
-    class DFA10 extends DFA {
+    static class DFA10 extends DFA {
 
         public DFA10(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
@@ -11316,7 +11316,7 @@ public class CTFParser extends Parser {
         }
     }
 
-    class DFA32 extends DFA {
+    static class DFA32 extends DFA {
 
         public DFA32(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
@@ -11367,7 +11367,7 @@ public class CTFParser extends Parser {
         }
     }
 
-    class DFA54 extends DFA {
+    static class DFA54 extends DFA {
 
         public DFA54(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-- 
2.34.1