Changeset 403 for trunk

Timestamp:

04/02/12 16:17:06 (13 years ago)

Author:

sherbold

Message:

• improved handling of empty MFC sessions

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows

Files:

• LogPreprocessor.java (modified) (2 diffs)
• MFCLogParser.java (modified) (1 diff)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogPreprocessor.java

@@ -160 +160 @@
                 String[] lines = FileTools.getLinesFromFile(source, false);
                 String incompleteLine = "";
-                // Open source and read line by line
                 for (String currentLine : lines) {
                         if (currentLine.contains("UL: <session>")) {
@@ -189 +188 @@
                                         byte[] decoded = decoder.decode(actualLine);
                                         currentContent = new String(decoded, "UTF-16LE");
-                                        currentContent = currentContent.substring(0,
-                                                        currentContent.length() - 1);
+                                        if( currentContent.length()!=0 ) {
+                                                currentContent = currentContent.substring(0,
+                                                                currentContent.length() - 1);
+                                        }
                                 } else {
                                         currentContent = actualLine;

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/MFCLogParser.java

@@ -210 +210 @@
                 } else if (qName.equals("session")) {
                         sequenceSplitter.endSession();
-                        sequences.add(sequenceSplitter.getSequence());
+                        List<WindowsEvent> seq = sequenceSplitter.getSequence();
+                        if( seq!=null && !seq.isEmpty() ) {
+                                sequences.add(seq);
+                        }
                         Console.traceln("end of session");
                 }