1.1 --- a/mdr/src/org/netbeans/mdr/handlers/InstanceHandler.java	Wed Nov 05 17:50:34 2003 +0000
     1.2 +++ b/mdr/src/org/netbeans/mdr/handlers/InstanceHandler.java	Wed Nov 05 22:43:56 2003 +0000
     1.3 @@ -223,25 +223,37 @@
     1.4      public final RefFeatured refOutermostComposite() {
     1.5          try {
     1.6              _lock(false);
     1.7 +            return _outermostComposite();
     1.8 +        } finally {
     1.9 +            _unlock();
    1.10 +        }
    1.11 +    }
    1.12 +    
    1.13 +    protected RefFeatured _outermostComposite() {
    1.14 +        try {
    1.15              return (RefFeatured) _getRepository().getHandler(getInstanceDelegate().getOutermostComposite());
    1.16          } catch ( StorageException e ) {
    1.17              throw new DebugException("Storage exception: " + e);
    1.18 -        } finally {
    1.19 -            _unlock();
    1.20          }
    1.21      }
    1.22  
    1.23      public final RefFeatured refImmediateComposite() {
    1.24          try {
    1.25              _lock(false);
    1.26 -            return (RefFeatured) _getRepository().getHandler(getInstanceDelegate().getImmediateComposite());
    1.27 -        } catch ( StorageException e ) {
    1.28 -            throw new DebugException("Storage exception: " + e);
    1.29 +            return _immediateComposite();
    1.30          } finally {
    1.31              _unlock();
    1.32          }
    1.33      }
    1.34  
    1.35 +    protected RefFeatured _immediateComposite() {
    1.36 +        try {
    1.37 +            return (RefFeatured) _getRepository().getHandler(getInstanceDelegate().getImmediateComposite());
    1.38 +        } catch ( StorageException e ) {
    1.39 +            throw new DebugException("Storage exception: " + e);
    1.40 +        }
    1.41 +    }
    1.42 +    
    1.43      public final boolean refIsInstanceOf(RefObject objType, boolean considerSubtypes) {
    1.44          try {
    1.45              _lock(false);