[freenet-cvs] r13699 - trunk/freenet/src/freenet/client

[t...@freenetproject.org]

Author: toad
Date: 2007-06-21 21:50:34 +0000 (Thu, 21 Jun 2007)
New Revision: 13699

Modified:
   trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Fix implicit container subdirs NPE

Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java        2007-06-21 
21:48:09 UTC (rev 13698)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java        2007-06-21 
21:50:34 UTC (rev 13699)
@@ -367,7 +367,7 @@
                        } else
                                after = name.substring(x+1, name.length());
                        Object o = dir.get(before);
-                       HashMap map;
+                       HashMap map = (HashMap) o;
                        if(o == null) {
                                map = new HashMap();
                                dir.put(before, map);
@@ -375,7 +375,6 @@
                        if(o instanceof String) {
                                throw new ArchiveFailureException("Invalid 
archive: contains "+name+" as both file and dir");
                        }
-                       map = (HashMap) o;
                        addToDirectory(map, after, prefix + before + '/');
                }
        }