You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2013/08/13 08:02:12 UTC

svn commit: r1513360 - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java src/changes/changes.xml

Author: rgoers
Date: Tue Aug 13 06:02:12 2013
New Revision: 1513360

URL: http://svn.apache.org/r1513360
Log:
LOG4J2-342 - Ignore xml:base attributes.

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java?rev=1513360&r1=1513359&r2=1513360&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java Tue Aug 13 06:02:12 2013
@@ -368,6 +368,9 @@ public class XMLConfiguration extends Ba
             final org.w3c.dom.Node w3cNode = attrs.item(i);
             if (w3cNode instanceof Attr) {
                 final Attr attr = (Attr) w3cNode;
+                if (attr.getName().equals("xml:base")) {
+                    continue;
+                }
                 attributes.put(attr.getName(), attr.getValue());
             }
         }

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1513360&r1=1513359&r2=1513360&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Tue Aug 13 06:02:12 2013
@@ -21,6 +21,9 @@
   </properties>
   <body>
     <release version="2.0-beta9" date="soon, very soon" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-342" dev="rgoers" type="fix">
+        Ignore xml:base attributes.
+      </action>
       <action issue="LOG4J2-309" dev="rgoers" type="fix">
         Insure jars and distributions only have a single License and Notice file.
       </action>