--- FM2SQL/Attic/DBBean.java	2004/06/01 18:58:08	1.20
+++ FM2SQL/Attic/DBBean.java	2004/06/10 13:19:18	1.21
@@ -1379,10 +1379,32 @@ public class DBBean
           byte[] b = null;
           if (metaData instanceof ResultSetMetaDataExt)
             b = resultSet.getBytes(i);
+          if(b!=null)
+          {
+            java.io.ByteArrayInputStream stream =(java.io.ByteArrayInputStream)resultSet.getBinaryStream(i);
+        //    System.out.println(" stream "+resultSet.getBinaryStream(i));
+            byte [] c= new byte[stream.available()];
+            int length=stream.read(c,0,c.length);
+           int count =0;
+           b= new byte[c.length];
+           for(int n=0;n<length;++n)
+           {
+             
+            if(c[n]!=0) 
+            {
+         //     System.out.println(c[n]+" "+(int)'?'+" "+(char)c[n]+" "+count+" "+b.length);
+              b[count++]=c[n];
+            } 
+           }
+           byte[] bCopy=new byte[count];
+           System.arraycopy(b,0,bCopy,0,count);
+       //    System.out.println();
+         b=bCopy;
+         }
           String utf8 = null;
           utf8 = (b == null) ? null : new String(b);
           if (metaData instanceof ResultSetMetaDataExt)
-            tableRow.addElement((b != null) ? new String(utf8.getBytes()) : null);
+            tableRow.addElement((b != null) ? Convert.normanToUnicode(utf8) : null);
           else
           {
             if(url.toLowerCase().indexOf("odbc")>=0)
@@ -1486,5 +1508,4 @@ public class DBBean
     metaData = (this.result==null) ?null:this.result.getMetaData();
     return t;
 	}
-	
 }
\ No newline at end of file