You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/11 07:37:48 UTC

svn commit: r1033823 - /geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java

Author: genspring
Date: Thu Nov 11 06:37:47 2010
New Revision: 1033823

URL: http://svn.apache.org/viewvc?rev=1033823&view=rev
Log:
missed a similar change

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java?rev=1033823&r1=1033822&r2=1033823&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/util/UniqueAttributesImpl.java Thu Nov 11 06:37:47 2010
@@ -93,11 +93,11 @@ public class UniqueAttributesImpl extend
                 attributes.put(qName, sb.toString());
                 super.addAttribute(uri, localName, qName, type, sb.toString());
 
-            } else if (qName.equals("pageEncoding")) {
+                } /*else if (qName.equals("pageEncoding")) {
 
-                // It's not clear in the spec on how to handle multiple pageEncoding attributes.
-                
-            } else if (!attributes.get(qName).equals(value)) {
+                    // It's not clear in the spec how would we handle multiple pageEncoding attributes.
+                    
+                } */else if (!attributes.get(qName).equals(value)) {
 
                 handleDuplicate(qName);
             }