# HG changeset patch
# User aefimov
# Date 1430222663 -10800
# Node ID 5734d1775f7982f2735cb83451e3caec70776626
# Parent 5b5e5ea9c8dd9e4ad6e06fc8bd61df249ae57ffd
8068842: Better JAXP data handling
Reviewed-by: joehw, dfuchs, lancea
diff -r 5b5e5ea9c8dd -r 5734d1775f79 drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
--- a/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java Fri Oct 23 16:41:06 2015 -0400
+++ b/drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java Tue Apr 28 15:04:23 2015 +0300
@@ -1,13 +1,13 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -22,10 +22,10 @@
*/
package com.sun.org.apache.xalan.internal.lib;
-import java.util.Hashtable;
-
import com.sun.org.apache.xml.internal.utils.DOMHelper;
import com.sun.org.apache.xpath.internal.NodeSet;
+import java.util.HashMap;
+import java.util.Map;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -192,7 +192,7 @@
NodeSet dist = new NodeSet();
dist.setShouldCacheNodes(true);
- Hashtable stringTable = new Hashtable();
+ Map
This dumps a simple header and then each of the entries in - * the Hashtable to our PrintWriter; it does special processing + * the Map to our PrintWriter; it does special processing * for entries that are .jars found in the classpath.
* - * @param h Hashtable of items to report on; presumably + * @param h Map of items to report on; presumably * filled in by our various check*() methods * @return true if your environment appears to have no major * problems; false if potential environment problems found - * @see #appendEnvironmentReport(Node, Document, Hashtable) + * @see #appendEnvironmentReport(Node, Document, Map) * for an equivalent that appends to a Node instead */ - protected boolean writeEnvironmentReport(Hashtable h) + protected boolean writeEnvironmentReport(Map