commit 869e81955680570d80b16147108bb214a043f446
author Jeff Thompson <jeff@thefirst.org> Sun Dec 16 12:18:24 2012 -0800
committer Jeff Thompson <jeff@thefirst.org> Sun Dec 16 12:18:24 2012 -0800
tree 9fb7435ec481e9418fa0598df055303ef485a849
parent 3d6ce9414248cfb923e5ca2fdb43e17c8be72588

Always compute contentSha256.

js/ndnProtocol/components/ndnProtocolService.js

diff --git a/js/ndnProtocol/components/ndnProtocolService.js b/js/ndnProtocol/components/ndnProtocolService.js
index 31749d5..a952574 100644
--- a/js/ndnProtocol/components/ndnProtocolService.js
+++ b/js/ndnProtocol/components/ndnProtocolService.js
@@ -165,14 +165,11 @@
         this.contentListener.onStart(contentTypeEtc.contentType, contentTypeEtc.contentCharset, 

             ioService.newURI(contentUriSpec, this.uriOriginCharset, null));

             

-        if (contentObject.name.getContentDigestValue() != null)

-            // We need to compute the content digest.

-            this.contentSha256 = new Sha256();

+        this.contentSha256 = new Sha256();

     }

 

     this.contentListener.onReceivedContent(DataUtils.toString(contentObject.content));

-    if (this.contentSha256 != null)

-        this.contentSha256.update(contentObject.content);

+    this.contentSha256.update(contentObject.content);

     

     // Check for the special case if the saved content is for the next segment that we need.

     if (this.firstReceivedContentObject != null && 

@@ -184,8 +181,7 @@
         this.firstReceivedContentObject = null;

         

         this.contentListener.onReceivedContent(DataUtils.toString(contentObject.content));        

-        if (this.contentSha256 != null)

-            this.contentSha256.update(contentObject.content);

+        this.contentSha256.update(contentObject.content);

     }

 

     var finalSegmentNumber = null;

@@ -209,13 +205,11 @@
     else {

         // Finished.

         this.contentListener.onStop();

-        if (this.contentSha256 != null) {

-            var nameContentDigest = contentObject.name.getContentDigestValue();

-            if (nameContentDigest != null &&

-                !DataUtils.arraysEqual(nameContentDigest, this.contentSha256.finalize()))

-                // TODO: How to show the user an error for invalid digest?

-                dump("Content does not match digest in name " + contentObject.name.to_uri());

-        }

+        var nameContentDigest = contentObject.name.getContentDigestValue();

+        if (nameContentDigest != null &&

+            !DataUtils.arraysEqual(nameContentDigest, this.contentSha256.finalize()))

+            // TODO: How to show the user an error for invalid digest?

+            dump("Content does not match digest in name " + contentObject.name.to_uri());

     }

         

     return Closure.RESULT_OK;