deadlock fix BLD200210100732
authormmatula@netbeans.org
Wed, 09 Oct 2002 16:28:42 +0000
changeset 10763413846610d2
parent 1075 df649a1b27f6
child 1077 e10e5b29bfd7
deadlock fix
mdr/src/org/netbeans/mdr/persistence/btreeimpl/btreestorage/BtreeStorage.java
     1.1 --- a/mdr/src/org/netbeans/mdr/persistence/btreeimpl/btreestorage/BtreeStorage.java	Wed Oct 09 15:55:07 2002 +0000
     1.2 +++ b/mdr/src/org/netbeans/mdr/persistence/btreeimpl/btreestorage/BtreeStorage.java	Wed Oct 09 16:28:42 2002 +0000
     1.3 @@ -391,7 +391,11 @@
     1.4         return this.mofIdEntryTypeInfo.toBuffer(mofid);
     1.5      }
     1.6       
     1.7 -    public synchronized MOFID readMOFID (java.io.InputStream inputStream) throws StorageException {
     1.8 +    // this method is always called from a thread safe code (readStreamable)
     1.9 +    // thus it does not need to be synchronized
    1.10 +    // if it shows up that it needs to be synchronized, a separate lock should be used
    1.11 +    // for that to avoid deadlocks
    1.12 +    public MOFID readMOFID (java.io.InputStream inputStream) throws StorageException {
    1.13          DataInputStream in = null;
    1.14          if (inputStream instanceof DataInputStream)
    1.15              in = (DataInputStream) inputStream;
    1.16 @@ -407,7 +411,7 @@
    1.17          }
    1.18      }
    1.19      
    1.20 -    public final synchronized MOFID readMOFIDData (java.io.InputStream in) throws StorageException {
    1.21 +    public final MOFID readMOFIDData (java.io.InputStream in) throws StorageException {
    1.22          if (this.mofIdEntryTypeInfo == null) {
    1.23              this.mofIdEntryTypeInfo = EntryTypeInfo.getEntryTypeInfo(Storage.EntryType.MOFID, this);
    1.24          }