2 files changed, 4 insertions, 1 deletions
diff --git a/libjava/classpath/javax/xml/namespace/NamespaceContext.java b/libjava/classpath/javax/xml/namespace/NamespaceContext.java
index 1bcb85006c1..b9722a47a53 100644
--- a/libjava/classpath/javax/xml/namespace/NamespaceContext.java
+++ b/libjava/classpath/javax/xml/namespace/NamespaceContext.java
@@ -61,6 +61,7 @@ public interface NamespaceContext
   /**
    * Returns all the prefixes currently bound to the given namespace URI.
    */
+  @SuppressWarnings("unchecked")
   public Iterator getPrefixes(String namespaceURI);
   
 }
diff --git a/libjava/classpath/javax/xml/namespace/QName.java b/libjava/classpath/javax/xml/namespace/QName.java
index 18dee79bbff..3c756237895 100644
--- a/libjava/classpath/javax/xml/namespace/QName.java
+++ b/libjava/classpath/javax/xml/namespace/QName.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.xml.namespace;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 import javax.xml.XMLConstants;
@@ -126,7 +128,7 @@ public class QName implements Serializable
   {
     if (qName == null)
       {
-	StringBuffer buf = new StringBuffer();
+	CPStringBuilder buf = new CPStringBuilder();
 	if (namespaceURI.length() > 0)
 	  {
 	    buf.append('{');