Repository: logging-log4j2
Updated Branches:
  refs/heads/master 679c4aba6 -> 383135357


Clarify Javadocs.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/38313535
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/38313535
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/38313535

Branch: refs/heads/master
Commit: 3831353570467885f1bddf10d286e6b2b609423c
Parents: 679c4ab
Author: Gary Gregory <ggreg...@apache.org>
Authored: Thu Sep 22 23:35:19 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Thu Sep 22 23:35:19 2016 -0700

----------------------------------------------------------------------
 .../log4j/config/Log4j1ConfigurationParser.java | 23 ++++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/38313535/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
----------------------------------------------------------------------
diff --git 
a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
 
b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index 16c9b7c..d71349e 100644
--- 
a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ 
b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -73,18 +73,17 @@ public class Log4j1ConfigurationParser {
        private final ConfigurationBuilder<BuiltConfiguration> builder = 
ConfigurationBuilderFactory
                        .newConfigurationBuilder();
 
-       /**
-        * Parse a Log4j 1.2 properties configuration file into a
-        * ConfigurationBuilder.
-        *
-        * @param input
-        *            InputStream to read from, will not be closed.
-        * @return the populated ConfigurationBuilder, never {@literal null}
-        * @throws IOException
-        *             if unable to read the input
-        * @throws ConfigurationException
-        *             if the input does not contain a valid configuration
-        */
+    /**
+     * Parses a Log4j 1.2 properties configuration file in ISO 8859-1 encoding 
into a ConfigurationBuilder.
+     *
+     * @param input
+     *            InputStream to read from is assumed to be ISO 8859-1, and 
will not be closed.
+     * @return the populated ConfigurationBuilder, never {@literal null}
+     * @throws IOException
+     *             if unable to read the input
+     * @throws ConfigurationException
+     *             if the input does not contain a valid configuration
+     */
        public ConfigurationBuilder<BuiltConfiguration> 
buildConfigurationBuilder(final InputStream input)
                        throws IOException {
                properties.load(input);

Reply via email to