cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util DirectoryIndexGenerator.java

[masonjm]

masonjm     2004/12/08 18:26:46

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        DirectoryIndexGenerator.java
  Log:
  Fixed NPE. Bug 32588.
  
  Revision  Changes    Path
  1.13      +17 -11    
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java
  
  Index: DirectoryIndexGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DirectoryIndexGenerator.java      6 Dec 2004 08:54:13 -0000       1.12
  +++ DirectoryIndexGenerator.java      9 Dec 2004 02:26:46 -0000       1.13
  @@ -301,22 +301,28 @@
               writer.print("<a href=\"");
               writer.print(WebdavUtils.getAbsolutePath(currentResource, req, 
config));
               writer.print("\"><tt>");
  -            NodeProperty displayname = 
currentDescriptor.getProperty("displayname");
  +            NodeProperty displayname = null;
  +            if (currentDescriptor != null) {
  +                displayname = currentDescriptor.getProperty("displayname");
  +            }
               if (displayname != null)
                  
writer.print(stringToCharacterRef((String)displayname.getValue()));
               else
                  writer.print(stringToCharacterRef(trimmed));   // I18N chars
                  
  -            if (WebdavUtils.isCollection(currentDescriptor)) {
  -                writer.print("/");
  -            }
  -            else if (WebdavUtils.isRedirectref(currentDescriptor)) {
  -                writer.print("*");
  +            if (currentDescriptor != null) {
  +                if (WebdavUtils.isCollection(currentDescriptor)) {
  +                    writer.print("/");
  +                }
  +                else if (WebdavUtils.isRedirectref(currentDescriptor)) {
  +                    writer.print("*");
  +                }
               }
               writer.print("</tt></a></td>\r\n");
               
               writer.print("<td align=\"right\"><tt>");
  -            if (WebdavUtils.isCollection(currentDescriptor)
  +            if (currentDescriptor == null
  +                    || WebdavUtils.isCollection(currentDescriptor)
                       || WebdavUtils.isRedirectref(currentDescriptor)) {
                   writer.print("&nbsp;");
               }
  
  
  

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