svn commit: r1633245 - /incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java

[rezan]

Author: rezan
Date: Mon Oct 20 22:35:57 2014
New Revision: 1633245

URL: http://svn.apache.org/r1633245
Log:
DMAP-84 xml entities

Modified:
    
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java

Modified: 
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java
URL: 
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java?rev=1633245&r1=1633244&r2=1633245&view=diff
==============================================================================
--- 
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java
 (original)
+++ 
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/parser/XMLParser.java
 Mon Oct 20 22:35:57 2014
@@ -75,7 +75,7 @@ public class XMLParser {
             }
         }
 
-        return ret.toString().trim();
+        return parseEntities(ret.toString().trim());
     }
 
     public static String getAttribute(String tag, String name) {
@@ -106,6 +106,12 @@ public class XMLParser {
             ret = ret.substring(0, endpos);
         }
 
-        return ret;
+        return parseEntities(ret);
+    }
+    
+    private static String parseEntities(String s) {
+        return s.replace(""", "\"").replace("&", "&")
+                .replace("&apos;", "'").replace("&lt;", "<")
+                .replace("&gt;", ">");
     }
 }