(commons-validator) 20/23: Revert "Better error handling"

[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-validator.git

commit caf4a4bdcc79deb76b4e9fd0209288a49d295490
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 1 09:04:59 2023 -0500

    Revert "Better error handling"
    
    This reverts commit 5dd59ef910b3c83cb13ba07b32880ff0c9e813e0.
---
 .../java/org/apache/commons/validator/ValidatorAction.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/validator/ValidatorAction.java 
b/src/main/java/org/apache/commons/validator/ValidatorAction.java
index baa57040..0b2c42f2 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorAction.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorAction.java
@@ -558,17 +558,13 @@ public class ValidatorAction implements Serializable {
      * @param name The resource name
      * @return An input stream for reading the resource, or {@code null} if 
the resource could not be found
      */
-    @SuppressWarnings("resource") // Caller closes
     private InputStream openInputStream(final String javaScriptFileName, 
ClassLoader classLoader) {
         InputStream is = null;
         if (classLoader != null) {
             is = classLoader.getResourceAsStream(javaScriptFileName);
         }
         if (is == null) {
-            is = getClass().getResourceAsStream(javaScriptFileName);
-        }
-        if (is == null) {
-            getLog().debug("  Unable to read javascript name " + 
javaScriptFileName);
+            return getClass().getResourceAsStream(javaScriptFileName);
         }
         return is;
     }
@@ -585,7 +581,12 @@ public class ValidatorAction implements Serializable {
             classLoader = getClass().getClassLoader();
         }
         try (InputStream is = openInputStream(javaScriptFileName, 
classLoader)) {
+            if (is == null) {
+                getLog().debug("  Unable to read javascript name " + 
javaScriptFileName);
+                return null;
+            }
             final StringBuilder buffer = new StringBuilder();
+            // TODO encoding
             try (BufferedReader reader = new BufferedReader(new 
InputStreamReader(is, StandardCharsets.UTF_8))) {
                 String line = null;
                 while ((line = reader.readLine()) != null) {