← Back to branch summary

~ubuntu-branches/ubuntu/karmic/classpath/karmic

« back to all changes in this revision

Viewing changes to java/io/ObjectInputStream.java

  • Committer: Bazaar Package Importer
  • Author(s): Manny Vindiola, Manny Vindiola, James Westby
  • Date: 2008-12-18 21:24:48 UTC
  • mfrom: (1.1.6 upstream) (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081218212448-ax2jaxx9r5175dkl
Tags: 2:0.97.2-1.1ubuntu1
https://launchpad.net/bugs/309549
https://launchpad.net/bugs/237668
https://launchpad.net/bugs/272772
[ Manny Vindiola ]
* Merge from debian unstable (LP: #309549)(LP: #237668), remaining changes:
  * debian/control:
    - Recommend firefox instead of mozilla-firefox.
  * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored
    - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch
    - update debian/patches/00list
  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
     (meta-package) must alternatively Depend/Recommend/Suggest abrowser
* Fix FTBFS due to missing mozilla-plugin build dependency 
  - changed to build-depends on libxul-dev instead of iceape-dev

[ James Westby ]
* Add libsamplerate0-dev to Build-Depends to fix build error by not being
  able to find the .a file from it. This is a dependency of jack, but not
  specified in it's depends. This is probably due to bug 258491, and so if
  that is fixed try building without the extra Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/io/ObjectInputStream.java
1
1
/* ObjectInputStream.java -- Class used to read serialized objects
2
 
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
 
2
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2008
3
3
   Free Software Foundation, Inc.
4
4
 
5
5
This file is part of GNU Classpath.
356
356
        }
357
357
        
358
358
       case TC_STRING:
359
 
       case TC_LONGSTRING:
360
359
        {
361
360
          if(dump) dumpElement("STRING=");
362
361
          String s = this.realInputStream.readUTF();
366
365
          break;
367
366
        }
368
367
 
 
368
       case TC_LONGSTRING:
 
369
        {
 
370
          if(dump) dumpElement("STRING=");
 
371
          String s = this.realInputStream.readUTFLong();
 
372
          if(dump) dumpElementln(s);
 
373
          ret_val = processResolution(null, s, assignNewHandle(s,shared),
 
374
                                      shared);
 
375
          break;
 
376
        }
 
377
 
369
378
       case TC_ARRAY:
370
379
        {
371
380
          if(dump) dumpElementln("ARRAY");
915
924
      return null;
916
925
 
917
926
    ObjectStreamClass oclazz;
918
 
    oclazz = (ObjectStreamClass)classLookupTable.get(clazz);
 
927
    oclazz = classLookupTable.get(clazz);
919
928
    if (oclazz == null)
920
929
      return ObjectStreamClass.lookup(clazz);
921
930
    else