[2/3] camel git commit: camel-snmp - should use xml encoder from camel-core as the current one was buggy. Thanks to Dmitry Zolotukhin for reporting.

[davsclaus]

camel-snmp - should use xml encoder from camel-core as the current one was 
buggy. Thanks to Dmitry Zolotukhin for reporting.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be2bde4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be2bde4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be2bde4c

Branch: refs/heads/master
Commit: be2bde4cd1980902e4c9921dea59f2ab8457cda9
Parents: de2a95e
Author: Claus Ibsen <davscl...@apache.org>
Authored: Sun Oct 4 11:26:18 2015 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sun Oct 4 11:47:34 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/component/snmp/SnmpConverters.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/be2bde4c/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
----------------------------------------------------------------------
diff --git 
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
 
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
index 990cbc8..93e13c0 100644
--- 
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
+++ 
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpConverters.java
@@ -20,6 +20,7 @@ import java.util.StringTokenizer;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
+import org.apache.camel.util.StringHelper;
 import org.snmp4j.PDU;
 import org.snmp4j.PDUv1;
 import org.snmp4j.smi.OID;
@@ -51,7 +52,7 @@ public final class SnmpConverters {
         try {
             OIDList list = new OIDList();
 
-            if (s != null && s.indexOf(",") != -1) {
+            if (s != null && s.contains(",")) {
                 // seems to be a comma separated oid list
                 StringTokenizer strTok = new StringTokenizer(s, ",");
                 while (strTok.hasMoreTokens()) {
@@ -121,7 +122,7 @@ public final class SnmpConverters {
             sb.append(b.getOid().toString());
             sb.append(OID_TAG_CLOSE);
             sb.append(VALUE_TAG_OPEN);
-            sb.append(getXmlSafeString(b.getVariable().toString()));
+            sb.append(StringHelper.xmlEncode(b.getVariable().toString()));
             sb.append(VALUE_TAG_CLOSE);
             sb.append(ENTRY_TAG_CLOSE);
         }
@@ -132,7 +133,4 @@ public final class SnmpConverters {
         return sb.toString();
     }
 
-    private static String getXmlSafeString(String string) {
-        return string.replaceAll("<", "&lt;").replaceAll(">", 
"&gt;").replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("'", 
"&apos;");
-    }
 }