fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various code fixes (#3704)

Browse Source 
Correctly close streams.
Avoid ArithmeticException in case of /0.
This commit is contained in:
yueh
2018-08-30 23:12:35 +02:00
committed by GitHub
parent a2091d10fe
commit 758377ed5d
4 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java
+17 -17
View File
@@ -84,7 +84,7 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket
// int originalBytes = stream.readableBytes();
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
try( final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
@Override
public int read() throws IOException
@@ -96,26 +96,26 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket
return stream.readByte() & STREAM_MASK;
}
} );
final ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() );
final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
while( gzReader.available() != 0 )
} ) )
{
final int bytes = gzReader.read( tmp );
if( bytes > 0 )
final ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() );
final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
while( gzReader.available() != 0 )
{
uncompressed.writeBytes( tmp, 0, bytes );
final int bytes = gzReader.read( tmp );
if( bytes > 0 )
{
uncompressed.writeBytes( tmp, 0, bytes );
}
}
}
gzReader.close();
// int uncompressedBytes = uncompressed.readableBytes();
// AELog.info( "Receiver: " + originalBytes + " -> " + uncompressedBytes );
while( uncompressed.readableBytes() > 0 )
{
this.list.add( AEFluidStack.fromPacket( uncompressed ) );
while( uncompressed.readableBytes() > 0 )
{
this.list.add( AEFluidStack.fromPacket( uncompressed ) );
}
}
this.empty = this.list.isEmpty();
src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java
+17 -17
View File
@@ -82,7 +82,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
// int originalBytes = stream.readableBytes();
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
try( GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
@Override
public int read() throws IOException
@@ -94,29 +94,29 @@ public class PacketMEInventoryUpdate extends AppEngPacket
return stream.readByte() & STREAM_MASK;
}
} );
final ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() );
final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
while( gzReader.available() != 0 )
} ) )
{
final int bytes = gzReader.read( tmp );
if( bytes > 0 )
final ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() );
final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
while( gzReader.available() != 0 )
{
uncompressed.writeBytes( tmp, 0, bytes );
final int bytes = gzReader.read( tmp );
if( bytes > 0 )
{
uncompressed.writeBytes( tmp, 0, bytes );
}
}
}
gzReader.close();
// int uncompressedBytes = uncompressed.readableBytes();
// AELog.info( "Receiver: " + originalBytes + " -> " + uncompressedBytes );
while( uncompressed.readableBytes() > 0 )
{
this.list.add( AEItemStack.fromPacket( uncompressed ) );
while( uncompressed.readableBytes() > 0 )
{
this.list.add( AEItemStack.fromPacket( uncompressed ) );
}
}
this.empty = this.list.isEmpty();
}
// api