Fix: localLine always 0 in message debug information

duangsuse-valid-projects · Apr 7, 2019 · 7307387 · 7307387
1 parent a3e7b4a
commit 7307387
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/helper/YamlDump.java b/helper/YamlDump.java
@@ -66,6 +66,9 @@ public static List<Map<String, Object>> getMessageMaps(@NotNull Set<Message<Stri
             if (debugs.containsKey(m.getIdentity()))
                 yamlObject.put("debug", debugs.get(m.getIdentity()));
 
+            if (debugs.containsKey(m.getHeader().getIdentity()))
+                yamlObject.put("header_debug", debugs.get(m.getHeader().getIdentity()));
+
             listMsgs.add(yamlObject);
         }
         return listMsgs;

diff --git a/scanner/Scanner.java b/scanner/Scanner.java
@@ -71,6 +71,7 @@ public boolean hasNext() {
             @Override
             public Message<String> next() {
                 lastMessage = new Message<>();
+                ++messageNo;
 
                 String tgName = "";
                 Date published = null;
@@ -219,9 +220,8 @@ public Message<String> next() {
                         break;
                 }
 
-                ++messageNo;
-                localLine = 0;
                 markSourceObject(lastMessage);
+                localLine = 0;
                 return lastMessage;
             }
         };