--- FM2SQL/Attic/DBBean.java	2004/09/20 14:07:51	1.34
+++ FM2SQL/Attic/DBBean.java	2004/10/19 11:12:19	1.36
@@ -653,17 +653,26 @@ public class DBBean
           // if(resultSet.getObject(i)!=null) System.out.println(resultSet.getObject(i));
           try
           {
+          	String utf8 = null;
+          	if (metaData instanceof ResultSetMetaDataExt)
+            {
             byte[] b = resultSet.getBytes(i);
-            String utf8 = null;
+            
             if (metaData instanceof ResultSetMetaDataExt)
               utf8 = (b == null) ? null : new String(b);
             else
               utf8 = (b == null) ? null : new String(b, "UTF-8");
-            utf8 = (utf8 == null) ? null : new String(utf8.getBytes("UTF-8"), "UTF-8");
-            tableRow.addElement(utf8);
+            }
+             else
+              utf8=resultSet.getString(i);
+                
+             	//  utf8 = (utf8 == null) ? null : new String(utf8.getBytes("UTF-8"), "UTF-8");
+          	tableRow.addElement(utf8);
+            
           } catch (Exception e)
           {
             System.out.println("Hey I Got an error" + e);
+            e.printStackTrace();
           }
           m_columnClasses.addElement(java.lang.String.class);
         }
@@ -748,7 +757,7 @@ public class DBBean
     } catch (Exception e)
     {
       // TODO remove
-      if (FM2SQL.fmInstance != null)
+      if (FM2SQL.fmInstance != null&&Convert.debug)
         FM2SQL.showErrorDialog("Error caught!! \n Query was  " + query + " \n", "Debug Info");
       e.printStackTrace();
     }