[Thaw-dev] r13229 - trunk/apps/Thaw/src/thaw/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-05-13 13:49:17 +0000 (Sun, 13 May 2007)
New Revision: 13229

Modified:
   trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
Log:
Thaw: Synchronize Sha256Computer a bit

Modified: trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-05-13 13:29:41 UTC 
(rev 13228)
+++ trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-05-13 13:49:17 UTC 
(rev 13229)
@@ -22,6 +22,7 @@
        private MessageDigest md;

        private String hash;
+       private final Object hashLock = new Object();
        private final String file;
        private final String headers;

@@ -40,9 +41,11 @@
                        md.reset();
                        md.update(headers.getBytes("UTF-8"));
                        SHA256.hash(in, md);
+                       
+                       synchronized (hashLock) {
+                               hash = Base64.encode(md.digest());      
+                       }

-                       hash = Base64.encode(md.digest());
-
                        SHA256.returnMessageDigest(md);

                } catch(java.io.FileNotFoundException e) {
@@ -67,6 +70,8 @@
         * Returns the Base64Encode of the hash
         */
        public String getHash() {
-               return hash;
+               synchronized (hashLock) {
+                       return hash;    
+               }
        }
 }