pnever      2003/01/21 04:55:52

  Modified:    src/stores/slidestore/file XMLFileDescriptorsStore.java
  Log:
  Fixed NPE which occured when trying to store a resource with the same
  URI as one that had been deleted earlier.
  Thanks to Ben Warren [[EMAIL PROTECTED]] for providing this fix.
  
  Revision  Changes    Path
  1.6       +15 -4     
jakarta-slide/src/stores/slidestore/file/XMLFileDescriptorsStore.java
  
  Index: XMLFileDescriptorsStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/slidestore/file/XMLFileDescriptorsStore.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLFileDescriptorsStore.java      14 May 2002 11:53:58 -0000      1.5
  +++ XMLFileDescriptorsStore.java      21 Jan 2003 12:55:52 -0000      1.6
  @@ -311,7 +311,18 @@
           if (aProps == null) {
               throw new ObjectNotFoundException(uri);
           }
  +
  +        // Delete the properties file
  +        File file = aProps.getFile(uri);
  +        if (file.exists()) {
  +          file.delete();
  +        }
  +
           aProps.removeObject(uri,object);
  +
  +        // Delete the reference to the properties
  +        definitions.remove(uri.toString());
  +        
           // System.out.println("----------- XMLMemDescriptorsStore removeObject 2/n 
uri="+uri+" aProps="+aProps);
       }
       
  
  
  

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

Reply via email to