[freenet-cvs] r22981 - branches/db4o/freenet/src/freenet/support/io

[t...@freenetproject.org]

Author: toad
Date: 2008-10-10 14:59:12 +0000 (Fri, 10 Oct 2008)
New Revision: 22981

Modified:
   
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
Log:
Remove WeakReference to Rijndael. This might have synchronization issues, 
causes greater GC overhead, and in any case isn't very useful.


Modified: 
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
  2008-10-10 12:48:14 UTC (rev 22980)
+++ 
branches/db4o/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
  2008-10-10 14:59:12 UTC (rev 22981)
@@ -6,9 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.ref.WeakReference;
 import java.util.Random;
-import java.util.Random;

 import org.spaceroots.mantissa.random.MersenneTwister;

@@ -32,7 +30,6 @@

        private final Bucket bucket;
        private final int minPaddedSize;
-       private transient WeakReference<Rijndael> aesRef;
        /** The decryption key. */
        private final byte[] key;
        private final byte[] randomSeed;
@@ -323,17 +320,12 @@

        private synchronized Rijndael getRijndael() {
                Rijndael aes;
-               if(aesRef != null) {
-                       aes = aesRef.get();
-                       if(aes != null) return aes;
-               }
                try {
                        aes = new Rijndael(256, 256);
                } catch (UnsupportedCipherException e) {
                        throw new Error(e);
                }
                aes.initialize(key);
-               aesRef = new WeakReference<Rijndael>(aes);
                return aes;
        }

@@ -412,6 +404,7 @@
        }

        public void objectOnActivate(ObjectContainer container) {
+               Logger.minor(this, "Activating "+super.toString()+" bucket == 
null = "+(bucket == null));
                // Cascading activation of dependancies
                container.activate(bucket, 1);
        }