jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r1569889 - /jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
Date Wed, 19 Feb 2014 19:54:32 GMT
Author: tripod
Date: Wed Feb 19 19:54:32 2014
New Revision: 1569889

URL: http://svn.apache.org/r1569889
Log:
JCRVLT-34 NPE in MemoryArchive

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java?rev=1569889&r1=1569888&r2=1569889&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
(original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/MemoryArchive.java
Wed Feb 19 19:54:32 2014
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.zip.ZipEntry;
@@ -234,11 +235,11 @@ public class MemoryArchive extends Abstr
         }
 
         public Collection<? extends Entry> getChildren() {
-            return children.values();
+            return children == null ? Collections.<Entry>emptyList() : children.values();
         }
 
         public Entry getChild(String name) {
-            return children.get(name);
+            return children == null ? null : children.get(name);
         }
 
         public VirtualEntry add(String name, long time, byte[] data) {



Mime
View raw message