rearranged some todos and preparing to implement SimpleClient and ClientDocument...

[vamsas.git] / src / org / vamsas / client / simpleclient / SimpleClientAppdata.java

diff --git a/src/org/vamsas/client/simpleclient/SimpleClientAppdata.java b/src/org/vamsas/client/simpleclient/SimpleClientAppdata.java
index 99dc336..52d5890 100644 (file)
--- a/src/org/vamsas/client/simpleclient/SimpleClientAppdata.java
+++ b/src/org/vamsas/client/simpleclient/SimpleClientAppdata.java
@@ -148,6 +148,10 @@ public class SimpleClientAppdata implements IClientAppdata {
    */
   private byte[] getAppDataAsByteArray(AppData appdata, VamsasArchiveReader docreader) {
     if (appdata.getData()==null) {
+      if (docreader==null) {
+        log.warn("Silently failing getAppDataAsByteArray with null docreader.",new Exception());
+        return null;
+      }
       // resolve and load data
       JarInputStream entry = getAppDataStream(appdata, docreader); 
       ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -183,7 +187,7 @@ public class SimpleClientAppdata implements IClientAppdata {
    * @return data in object or null if no data is accessible
    */
   private DataInput getAppDataAsDataInputStream(AppData appdata, VamsasArchiveReader docreader) {
-    if (appdata!=null) {
+    if (appdata!=null && docreader!=null) {
       String entryRef = appdata.getDataReference();
       if (entryRef!=null) {
         log.debug("Resolving AppData reference for "+entryRef);