[Madeleine-commit] madeleine/lib/madeleine automatic.rb,1.37,1.38

[S S. <sd...@us...>]

Update of /cvsroot/madeleine/madeleine/lib/madeleine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8212/lib/madeleine

Modified Files:
	automatic.rb 
Log Message:
news update, removed soap fix from deserialize - done in zmarshal now

Index: automatic.rb
===================================================================
RCS file: /cvsroot/madeleine/madeleine/lib/madeleine/automatic.rb,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** automatic.rb	2 Aug 2004 16:55:00 -0000	1.37
--- automatic.rb	3 Aug 2004 20:44:21 -0000	1.38
***************
*** 400,411 ****
              io.rewind
              if (detected_zmarshaller)
!               if (detected_zmarshaller == SOAP::Marshal)
!                 zio = Zlib::GzipReader.new(io)
!                 xml = zio.read  # REXML won't read from a gzip reader, but it will load a string
!                 zio.finish
!                 SOAP::Marshal.load(xml)
!               else
!                 ZMarshal.new(detected_zmarshaller).load(io)
!               end
              else
                raise e
--- 400,404 ----
              io.rewind
              if (detected_zmarshaller)
!               ZMarshal.new(detected_zmarshaller).load(io)
              else
                raise e