1.1 --- a/mdr/src/org/netbeans/mdr/storagemodel/StorableObject.java	Thu Dec 12 10:25:10 2002 +0000
     1.2 +++ b/mdr/src/org/netbeans/mdr/storagemodel/StorableObject.java	Fri Dec 13 14:31:25 2002 +0000
     1.3 @@ -16,6 +16,7 @@
     1.4  import java.util.*;
     1.5  
     1.6  import javax.jmi.model.Association;
     1.7 +import javax.jmi.reflect.JmiException;
     1.8  import javax.jmi.reflect.RefObject;
     1.9  import javax.jmi.reflect.WrongSizeException;
    1.10  
    1.11 @@ -290,6 +291,8 @@
    1.12                              temp = assoc._query(assocStorable.getEnd2Name(), thisObject);
    1.13                          } catch (ClassCastException e) {
    1.14                              temp = null;
    1.15 +                        } catch (JmiException e) {
    1.16 +                            temp = assoc._handleQuery(assocStorable.getEnd2Name(), thisObject);
    1.17                          }
    1.18                          if (temp != null) {
    1.19                              if (temp instanceof Collection) {
    1.20 @@ -309,6 +312,8 @@
    1.21                              temp = assoc._query(assocStorable.getEnd1Name(), thisObject);
    1.22                          } catch (ClassCastException e) {
    1.23                              temp = null;
    1.24 +                        } catch (JmiException e) {
    1.25 +                            temp = assoc._handleQuery(assocStorable.getEnd1Name(), thisObject);
    1.26                          }
    1.27                          if (temp != null) {
    1.28                              if (temp instanceof Collection) {