cvs commit: jakarta-slide/src/stores/org/apache/slide/store/txfile AbstractXMLResourceDescriptor.java

[ozeigermann]

ozeigermann    2004/09/22 07:15:22

  Modified:    src/stores/org/apache/slide/store/txfile Tag:
                        SLIDE_2_1_RELEASE_BRANCH
                        AbstractXMLResourceDescriptor.java
  Log:
  Fixed NPE when object is stored in different store.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.1   +6 -6      
jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractXMLResourceDescriptor.java
  
  Index: AbstractXMLResourceDescriptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/AbstractXMLResourceDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- AbstractXMLResourceDescriptor.java        28 Jul 2004 09:33:58 -0000      1.3
  +++ AbstractXMLResourceDescriptor.java        22 Sep 2004 14:15:21 -0000      1.3.2.1
  @@ -654,14 +654,14 @@
               if (object instanceof LinkNode) {
                   aElementObjectNode.setAttribute("linkTo", ((LinkNode) 
object).getLinkedUri());
               }
  +            aElementObjectNode.addContent(createBindings("children", "child", 
object.enumerateBindings()));
  +            aElementObjectNode.addContent(createBindings("parents", "parent", 
object.enumerateParentBindings()));
  +            aElementObjectNode.addContent(createElements("links", "link", 
object.enumerateLinks()));
           } else {
               // for null locks
               aElementObjectNode.setAttribute("classname", "null");
               aElementObjectNode.setAttribute("uri", uri.toString());
           }
  -        aElementObjectNode.addContent(createBindings("children", "child", 
object.enumerateBindings()));
  -        aElementObjectNode.addContent(createBindings("parents", "parent", 
object.enumerateParentBindings()));
  -        aElementObjectNode.addContent(createElements("links", "link", 
object.enumerateLinks()));
           return aElementObjectNode;
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]