Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -78,12 +78,6 @@ namespace System.Web.Util {
w.Write ((long) value);
break;
case TypeCode.Object:
#if TARGET_J2EE
if (w.BaseStream is java.io.ObjectOutput) {
((java.io.ObjectOutput) w.BaseStream).writeObject (value);
return;
}
#endif
BinaryFormatter bf = new BinaryFormatter ();
bf.Serialize (w.BaseStream, value);
break;
@ -136,10 +130,6 @@ namespace System.Web.Util {
case TypeCode.Int64:
return r.ReadInt64 ();
case TypeCode.Object:
#if TARGET_J2EE
if (r.BaseStream is java.io.ObjectInput)
return ((java.io.ObjectInput) r.BaseStream).readObject ();
#endif
BinaryFormatter bf = new BinaryFormatter ();
return bf.Deserialize (r.BaseStream);
case TypeCode.SByte: