You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/01/16 19:34:16 UTC
[commons-io] branch master updated: Rename package-private constant
consistently.
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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 2c33998 Rename package-private constant consistently.
2c33998 is described below
commit 2c33998f0a56d04656506e80f959e3c1a7cf4ee0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 14:34:12 2021 -0500
Rename package-private constant consistently.
---
.../java/org/apache/commons/io/monitor/FileAlterationObserver.java | 4 ++--
src/main/java/org/apache/commons/io/monitor/FileEntry.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
index eff69a1..50e86ca 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
@@ -324,7 +324,7 @@ public class FileAlterationObserver implements Serializable {
*/
private void checkAndNotify(final FileEntry parent, final FileEntry[] previous, final File[] files) {
int c = 0;
- final FileEntry[] current = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_ENTRIES;
+ final FileEntry[] current = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY;
for (final FileEntry entry : previous) {
while (c < files.length && comparator.compare(entry.getFile(), files[c]) > 0) {
current[c] = createFileEntry(parent, files[c]);
@@ -371,7 +371,7 @@ public class FileAlterationObserver implements Serializable {
*/
private FileEntry[] doListFiles(final File file, final FileEntry entry) {
final File[] files = listFiles(file);
- final FileEntry[] children = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_ENTRIES;
+ final FileEntry[] children = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY;
for (int i = 0; i < files.length; i++) {
children[i] = createFileEntry(entry, files[i]);
}
diff --git a/src/main/java/org/apache/commons/io/monitor/FileEntry.java b/src/main/java/org/apache/commons/io/monitor/FileEntry.java
index 0f411e8..bc8bcb6 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileEntry.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileEntry.java
@@ -44,7 +44,7 @@ public class FileEntry implements Serializable {
private static final long serialVersionUID = -2505664948818681153L;
- static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0];
+ static final FileEntry[] EMPTY_FILE_ENTRY_ARRAY = new FileEntry[0];
private final FileEntry parent;
private FileEntry[] children;
@@ -154,7 +154,7 @@ public class FileEntry implements Serializable {
* directory is empty
*/
public FileEntry[] getChildren() {
- return children != null ? children : EMPTY_ENTRIES;
+ return children != null ? children : EMPTY_FILE_ENTRY_ARRAY;
}
/**