You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/09/22 16:11:28 UTC

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

ozeigermann    2004/09/22 07:11:27

  Modified:    src/stores/org/apache/slide/store/txfile
                        AbstractXMLResourceDescriptor.java
  Log:
  Fixed NPE when object is stored in different store.
  
  Revision  Changes    Path
  1.4       +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.4
  diff -u -r1.3 -r1.4
  --- AbstractXMLResourceDescriptor.java	28 Jul 2004 09:33:58 -0000	1.3
  +++ AbstractXMLResourceDescriptor.java	22 Sep 2004 14:11:24 -0000	1.4
  @@ -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: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org