Revert "QPID-5067: Changed language bindings to use UTF-8 encoding on strings."

This reverts commit e9abca572cf1845bd3ad25238e3edbeef10e61a6.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1513818 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 8 insertions, 19 deletions

diff --git a/qpid/cpp/include/qpid/swig_perl_typemaps.i b/qpid/cpp/include/qpid/swig_perl_typemaps.i
index da949a9498..da24bfe402 100644
--- a/qpid/cpp/include/qpid/swig_perl_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_perl_typemaps.i
@@ -51,9 +51,9 @@
                 STRLEN len;
                 char *ptr = SvPV(value, len);
                 qpid::types::Variant v =  qpid::types::Variant(std::string(ptr,len));
-                // if (SvUTF8(value)) {
-                v.setEncoding("utf8");
-                // }
+                if (SvUTF8(value)) {
+                    v.setEncoding("utf8");
+                }
                 return v;
             }
         }
@@ -103,9 +103,9 @@
             case qpid::types::VAR_STRING : {
                 const std::string val(v->asString());
                 result = newSVpvn(val.c_str(), val.size());
-                //  if( v->getEncoding() == "utf8" ) {
-                SvUTF8_on(result);
-                //  }
+                if( v->getEncoding() == "utf8" ) {
+                    SvUTF8_on(result);
+                }
                 break;
             }
             case qpid::types::VAR_MAP : {
diff --git a/qpid/cpp/include/qpid/swig_python_typemaps.i b/qpid/cpp/include/qpid/swig_python_typemaps.i
index d6f112bdf7..25a4e46b18 100644
--- a/qpid/cpp/include/qpid/swig_python_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_python_typemaps.i
@@ -60,11 +60,7 @@ typedef int Py_ssize_t;
         if (PyFloat_Check(value))  return qpid::types::Variant(PyFloat_AS_DOUBLE(value));
         if (PyInt_Check(value))    return qpid::types::Variant(int64_t(PyInt_AS_LONG(value)));
         if (PyLong_Check(value))   return qpid::types::Variant(int64_t(PyLong_AsLongLong(value)));
-        if (PyString_Check(value)) {
-          qpid::types::Variant v = qpid::types::Variant(std::string(PyString_AS_STRING(value)));
-          v.setEncoding("utf8");
-          return v;
-        }
+        if (PyString_Check(value)) return qpid::types::Variant(std::string(PyString_AS_STRING(value)));
         if (PyDict_Check(value)) {
             qpid::types::Variant::Map map;
             PyToMap(value, &map);
diff --git a/qpid/cpp/include/qpid/swig_ruby_typemaps.i b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
index b7befb7291..1a07cc86b0 100644
--- a/qpid/cpp/include/qpid/swig_ruby_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
@@ -27,16 +27,9 @@
     void RbToList(VALUE, qpid::types::Variant::List*);
 
     qpid::types::Variant RbToVariant(VALUE value) {
-      printf("RbToVariant is of type %d\n", TYPE(value));
         switch (TYPE(value)) {
         case T_FLOAT:   return qpid::types::Variant(NUM2DBL(value));
-        case T_STRING: {
-          qpid::types::Variant v = qpid::types::Variant();
-          v = StringValuePtr(value));
-          v.setEncoding("utf8");
-          return v;
-        }
-          break;
+        case T_STRING:  return qpid::types::Variant(StringValuePtr(value));
         case T_FIXNUM:  return qpid::types::Variant((int64_t) FIX2LONG(value));
         case T_BIGNUM:  return qpid::types::Variant((int64_t) NUM2LL(value));
         case T_TRUE:    return qpid::types::Variant(true);