luetzkendorf    2004/07/20 06:02:46

  Modified:    src/stores/org/apache/slide/store/txfile
                        AbstractXMLResourceDescriptor.java
  Log:
  fix for NodeLocks with null as owner info; otherwise
  a jdom.IllegalDataException ith trown
  (see test case putLockPut204Unlock)
  
  Revision  Changes    Path
  1.2       +5 -4      
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLResourceDescriptor.java        21 Apr 2004 08:30:23 -0000      1.1
  +++ AbstractXMLResourceDescriptor.java        20 Jul 2004 13:02:46 -0000      1.2
  @@ -693,7 +693,8 @@
               aElementLock.setAttribute("inheritance", 
booleanToString(aLock.isInheritable()));
               aElementLock.setAttribute("exclusive", 
booleanToString(aLock.isExclusive()));
               aElementLock.setAttribute("lockId", aLock.getLockId());
  -            aElementLock.setAttribute("owner", aLock.getOwnerInfo());
  +            aElementLock.setAttribute("owner", 
  +                  aLock.getOwnerInfo() == null ? "" : aLock.getOwnerInfo());
               aElementLocks.addContent(aElementLock);
           }
           return aElementLocks;
  
  
  

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

Reply via email to