Merge remote-tracking branch 'origin/master' into parse-pcap

# Conflicts: # src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
2020-04-10 22:02:55 +03:00
parent 4e0cfd1447 fc46e36eab
commit f32ed5eedd
9 changed files with 43 additions and 46 deletions
--- a/src/main/java/ru/serega6531/packmate/model/Packet.java
+++ b/src/main/java/ru/serega6531/packmate/model/Packet.java
@@ -53,7 +53,7 @@ public class Packet {

    private boolean ungzipped;

-    private boolean webSocketInflated;
+    private boolean webSocketParsed;

    private byte[] content;