--- /home/cpdev/src/classpath/gnu/xml/aelfred2/XmlParser.java	2005-07-02 21:03:11.000000000 +0000
+++ gnu/xml/aelfred2/XmlParser.java	2005-06-30 05:34:17.000000000 +0000
@@ -1437,7 +1437,7 @@
       }
     else
       {
-        if (type == null || type.equals("CDATA"))
+        if (type.equals("CDATA") || type == null)
           {
             value = readLiteral(flags);
           }
@@ -4559,7 +4559,7 @@
                           encoding.substring(temp + 1,
                                              encoding.indexOf('"', temp + 2));
                       }
-                    encoding = encoding.trim();
+                    encoding.trim();
                   }
                 else
                   {