[Instantobjects-cvscommit] SF.net SVN: instantobjects:[899] trunk/Source/Core/InstantBrokers.pas

[<na...@us...>]

Revision: 899
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=899&view=rev
Author:   nandod
Date:     2010-08-12 08:37:28 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
* Fixed a bug that prevented loading of embedded part/parts attributes on MBCS databases (WideMemo) in D2009+. Tested under Delphi 2010 against a Firebird database with UTF-8 charset.

Modified Paths:
--------------
    trunk/Source/Core/InstantBrokers.pas

Modified: trunk/Source/Core/InstantBrokers.pas
===================================================================
--- trunk/Source/Core/InstantBrokers.pas	2010-07-12 11:25:42 UTC (rev 898)
+++ trunk/Source/Core/InstantBrokers.pas	2010-08-12 08:37:28 UTC (rev 899)
@@ -1750,10 +1750,6 @@
 
 function TInstantCustomResolver.CreateEmbeddedObjectInputStream(
   const AConnector: TInstantConnector; const AField: TField): TStream;
-{$IFDEF D12+}
-var
-  LEncoding: TEncoding;
-{$ENDIF}
 begin
   Assert(Assigned(AConnector));
   Assert(Assigned(AField));
@@ -1762,13 +1758,8 @@
   if AConnector.BlobStreamFormat = sfBinary then
     Result := TBytesStream.Create(AField.AsBytes)
   else
-  begin
-    TEncoding.GetBufferEncoding(AField.AsBytes, LEncoding);
-    Result := TInstantStringStream.Create(LEncoding.GetString(AField.AsBytes));
-  end;
-  {$ELSE}
-  Result := TInstantStringStream.Create(AField.AsString);
   {$ENDIF}
+  Result := TInstantStringStream.Create(AField.AsString);
 end;
 
 function TInstantCustomResolver.CreateEmbeddedObjectOutputStream(