[commons-compress] 02/03: Simpler package private name

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git

commit 724cbfa9b5f25a884c7bb8dc85e2e8b96f6f1db2
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Nov 30 07:32:39 2022 -0500

    Simpler package private name
    
    Only look up name once
---
 .../apache/commons/compress/archivers/zip/ZipArchiveEntry.java   | 7 +++----
 .../java/org/apache/commons/compress/archivers/zip/ZipFile.java  | 9 +++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
index 0186f4ab..706e5020 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
@@ -55,9 +55,9 @@ import org.apache.commons.compress.utils.ByteUtils;
  *
  * @NotThreadSafe
  */
-public class ZipArchiveEntry extends java.util.zip.ZipEntry
-    implements ArchiveEntry, EntryStreamOffsets
-{
+public class ZipArchiveEntry extends java.util.zip.ZipEntry implements 
ArchiveEntry, EntryStreamOffsets {
+
+    static final ZipArchiveEntry[] EMPTY_ARRAY = {};
 
     public static final int PLATFORM_UNIX = 3;
     public static final int PLATFORM_FAT  = 0;
@@ -149,7 +149,6 @@ public class ZipArchiveEntry extends java.util.zip.ZipEntry
     private NameSource nameSource = NameSource.NAME;
     private CommentSource commentSource = CommentSource.COMMENT;
     private long diskNumberStart;
-    static final ZipArchiveEntry[] EMPTY_ZIP_ARCHIVE_ENTRY_ARRAY = {};
 
     /**
      * Creates a new zip entry with the specified name.
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
index f06245da..df18dd41 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
@@ -507,7 +507,7 @@ public class ZipFile implements Closeable {
      * @since 1.1
      */
     public Enumeration<ZipArchiveEntry> getEntriesInPhysicalOrder() {
-        final ZipArchiveEntry[] allEntries = 
entries.toArray(ZipArchiveEntry.EMPTY_ZIP_ARCHIVE_ENTRY_ARRAY);
+        final ZipArchiveEntry[] allEntries = 
entries.toArray(ZipArchiveEntry.EMPTY_ARRAY);
         Arrays.sort(allEntries, offsetComparator);
         return Collections.enumeration(Arrays.asList(allEntries));
     }
@@ -554,9 +554,10 @@ public class ZipFile implements Closeable {
      * @since 1.6
      */
     public Iterable<ZipArchiveEntry> getEntriesInPhysicalOrder(final String 
name) {
-        ZipArchiveEntry[] entriesOfThatName = 
ZipArchiveEntry.EMPTY_ZIP_ARCHIVE_ENTRY_ARRAY;
-        if (nameMap.containsKey(name)) {
-            entriesOfThatName = nameMap.get(name).toArray(entriesOfThatName);
+        ZipArchiveEntry[] entriesOfThatName = ZipArchiveEntry.EMPTY_ARRAY;
+        final LinkedList<ZipArchiveEntry> linkedList = nameMap.get(name);
+        if (linkedList != null) {
+            entriesOfThatName = linkedList.toArray(entriesOfThatName);
             Arrays.sort(entriesOfThatName, offsetComparator);
         }
         return Arrays.asList(entriesOfThatName);