avoid some not required object creation

HtmlUnit · Nov 22, 2024 · 508bde2 · 508bde2
1 parent 616522b
commit 508bde2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/htmlunit/html/DefaultElementFactory.java b/src/main/java/org/htmlunit/html/DefaultElementFactory.java
@@ -730,11 +730,16 @@ public HtmlElement createElementNS(final SgmlPage page, final String namespaceUR
      * @return the map of attribute values for {@link HtmlElement}s
      */
     static Map<String, DomAttr> toMap(final SgmlPage page, final Attributes attributes) {
+        // it is ok to return null here, the element ctor's are able to deal with that
         if (attributes == null) {
-            return new OrderedFastHashMapWithLowercaseKeys<>(0);
+            return null;
         }
 
         final int length = attributes.getLength();
+        if (length == 0) {
+            return null;
+        }
+
         final Map<String, DomAttr> attributeMap = new OrderedFastHashMapWithLowercaseKeys<>(length);
 
         // small performance optimization if we know the attributes we can avoid some index lookups

diff --git a/src/main/java/org/htmlunit/html/DomElement.java b/src/main/java/org/htmlunit/html/DomElement.java
@@ -128,7 +128,10 @@ public DomElement(final String namespaceURI, final String qualifiedName, final S
             final Map<String, DomAttr> attributes) {
         super(namespaceURI, qualifiedName, page);
 
-        if (attributes != null) {
+        if (attributes == null) {
+            attributes_ = new NamedAttrNodeMapImpl(this, isAttributeCaseSensitive());
+        }
+        else {
             attributes_ = new NamedAttrNodeMapImpl(this, isAttributeCaseSensitive(), attributes);
 
             for (final DomAttr entry : attributes.values()) {
@@ -144,9 +147,6 @@ public DomElement(final String namespaceURI, final String qualifiedName, final S
                 }
             }
         }
-        else {
-            attributes_ = new NamedAttrNodeMapImpl(this, isAttributeCaseSensitive());
-        }
     }
 
     /**