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/09/13 16:04:12 UTC

[commons-io] branch master updated: Better internal names.

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 d35a0ab  Better internal names.
d35a0ab is described below

commit d35a0ab5fe770903ef9742749266d109fced6ebc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 13 09:04:08 2021 -0700

    Better internal names.
---
 src/main/java/org/apache/commons/io/FileUtils.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/FileUtils.java b/src/main/java/org/apache/commons/io/FileUtils.java
index ff0e7f5..932cf6f 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1144,14 +1144,14 @@ public class FileUtils {
         String decoded = url;
         if (url != null && url.indexOf('%') >= 0) {
             final int n = url.length();
-            final StringBuilder buffer = new StringBuilder();
-            final ByteBuffer bytes = ByteBuffer.allocate(n);
+            final StringBuilder builder = new StringBuilder();
+            final ByteBuffer byteBuffer = ByteBuffer.allocate(n);
             for (int i = 0; i < n; ) {
                 if (url.charAt(i) == '%') {
                     try {
                         do {
                             final byte octet = (byte) Integer.parseInt(url.substring(i + 1, i + 3), 16);
-                            bytes.put(octet);
+                            byteBuffer.put(octet);
                             i += 3;
                         } while (i < n && url.charAt(i) == '%');
                         continue;
@@ -1159,16 +1159,16 @@ public class FileUtils {
                         // malformed percent-encoded octet, fall through and
                         // append characters literally
                     } finally {
-                        if (bytes.position() > 0) {
-                            bytes.flip();
-                            buffer.append(StandardCharsets.UTF_8.decode(bytes).toString());
-                            bytes.clear();
+                        if (byteBuffer.position() > 0) {
+                            byteBuffer.flip();
+                            builder.append(StandardCharsets.UTF_8.decode(byteBuffer).toString());
+                            byteBuffer.clear();
                         }
                     }
                 }
-                buffer.append(url.charAt(i++));
+                builder.append(url.charAt(i++));
             }
-            decoded = buffer.toString();
+            decoded = builder.toString();
         }
         return decoded;
     }