Skip to content

Commit 120c5f3

Browse files
committed
2022.2 patch 1 Release
1 parent 8da562b commit 120c5f3

5 files changed

Lines changed: 22 additions & 3 deletions

File tree

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2022, Perforce Software, Inc. All rights reserved.
1+
Copyright (c) 2023, Perforce Software, Inc. All rights reserved.
22

33

44

RELEASE.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,18 @@ Known Limitations
121121
<java-home>/lib/security/local_policy.jar
122122
<java-home>/lib/security/US_export_policy.jar
123123

124+
-------------------------------------------
125+
Updates in 2022.1 Patch 1 (2023/01/12)
126+
127+
#2390507 (Job #113889)
128+
Syncing large files could produce corrupted client files larger than
129+
the expected size. Compressed files (binary or +C) are now properly
130+
decompressed. When writing converted bytes, we reset the temp buffer for
131+
compressed data and not close.
132+
133+
#2389019 (Job #113888)
134+
Syncing +x files will now always set the execute bit.
135+
124136
-------------------------------------------
125137
Updates in 2022.1 (2022/09/29)
126138

gradlew

100644100755
File mode changed.

src/main/java/com/perforce/p4java/impl/mapbased/rpc/sys/RpcOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ public long writeConverted(byte[] sourceBytes) throws IOException, FileDecoderEx
373373
case FST_UTF16_GUNZIP:
374374
case FST_XUTF16_GUNZIP:
375375
case FST_XUNICODE_GUNZIP:
376-
sourceBytes = decompressSourceBytes(sourceBytes);
377376
// Convert to local charset if set
378377
if (this.converter != null) {
378+
sourceBytes = decompressSourceBytes(sourceBytes);
379379
// Convert line endings before converting to unicode
380380
sourceBytes = convertLineEnding(sourceBytes);
381381
sourceBytes = convertCharset(sourceBytes);
@@ -451,7 +451,7 @@ private byte[] decompressSourceBytes(byte[] sourceBytes) throws IOException {
451451
decompress(sourceBytes, len);
452452
byte[] uncompressedBytes = tempBufferToStoreCompressedBytes.toByteArray();
453453
len = uncompressedBytes.length;
454-
tempBufferToStoreCompressedBytes.close();
454+
tempBufferToStoreCompressedBytes.reset();
455455
return uncompressedBytes;
456456
}
457457

src/main/java/com/perforce/p4java/impl/mapbased/rpc/sys/RpcPerforceFileType.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,19 @@ public static RpcPerforceFileType decodeFromServerString(String str) {
313313
public boolean isExecutable() {
314314
switch (this) {
315315
case FST_XTEXT:
316+
case FST_XTEXT_GUNZIP:
316317
case FST_XRTEXT:
318+
case FST_XRTEXT_GUNZIP:
317319
case FST_XAPPLEFILE:
320+
case FST_XAPPLEFILE_GUNZIP:
318321
case FST_XBINARY:
322+
case FST_XBINARY_GUNZIP:
319323
case FST_XUNICODE:
324+
case FST_XUNICODE_GUNZIP:
320325
case FST_XUTF8:
326+
case FST_XUTF8_GUNZIP:
321327
case FST_XUTF16:
328+
case FST_XUTF16_GUNZIP:
322329
case FST_XGUNZIP:
323330
return true;
324331
default:

0 commit comments

Comments
 (0)