0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправлена ошибка разархивирования gzip

Browse Source
This commit is contained in:
serega6531
2019-05-20 19:18:19 +03:00
parent 669bcaa873
commit 9f48d9c3b0
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/ru/serega6531/packmate/service/StreamService.java
View File

@@ -16,9 +16,7 @@ import ru.serega6531.packmate.repository.StreamRepository;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.ZipException; import java.util.zip.ZipException;
@@ -106,10 +104,12 @@ public class StreamService {
List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1); List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1);
Packet decompressed = decompressGzipPackets(cut); Packet decompressed = decompressGzipPackets(cut);
packets.removeAll(cut); if(decompressed != null) {
packets.add(gzipStartPacket, decompressed); packets.removeAll(cut);
gzipStarted = false; packets.add(gzipStartPacket, decompressed);
i = gzipStartPacket + 1; gzipStarted = false;
i = gzipStartPacket + 1;
}
} else if (!packet.isIncoming()) { } else if (!packet.isIncoming()) {
String content = new String(packet.getContent()); String content = new String(packet.getContent());
@@ -121,10 +121,12 @@ public class StreamService {
List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1); List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1);
Packet decompressed = decompressGzipPackets(cut); Packet decompressed = decompressGzipPackets(cut);
packets.removeAll(cut); if(decompressed != null) {
packets.add(gzipStartPacket, decompressed); packets.removeAll(cut);
gzipStarted = false; packets.add(gzipStartPacket, decompressed);
i = gzipStartPacket + 1; gzipStarted = false;
i = gzipStartPacket + 1;
}
} }
if (contentPos != -1) { // начало body if (contentPos != -1) { // начало body
@@ -143,8 +145,10 @@ public class StreamService {
List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1); List<Packet> cut = packets.subList(gzipStartPacket, gzipEndPacket + 1);
Packet decompressed = decompressGzipPackets(cut); Packet decompressed = decompressGzipPackets(cut);
packets.removeAll(cut); if(decompressed != null) {
packets.add(gzipStartPacket, decompressed); packets.removeAll(cut);
packets.add(gzipStartPacket, decompressed);
}
} }
} }