Index: src/org/netbeans/modules/java/JavaDataObject.java
===================================================================
RCS file: /cvs/java/src/org/netbeans/modules/java/JavaDataObject.java,v
retrieving revision 1.150
diff -r1.150 JavaDataObject.java
319,324c319,324
<         InstanceSupport prev = (InstanceSupport) cookies.getCookie(InstanceCookie.class);
< 
<         if (prev != null)
<             cookies.remove(prev);
<         if (upToDate.equals(Boolean.TRUE))
<             cookies.add(new InstanceSupport(getPrimaryEntry()));
---
>         
>         if (upToDate.equals(Boolean.TRUE)) {
>             cookies.add(InstanceCookie.class, this);
>         } else {
>             cookies.remove(InstanceCookie.class, this);
>         }