[freenet-cvs] r26368 - trunk/freenet/src/freenet/keys

[toad]

Author: toad
Date: 2009-04-02 17:31:08 +0000 (Thu, 02 Apr 2009)
New Revision: 26368

Modified:
   trunk/freenet/src/freenet/keys/FreenetURI.java
Log:
Comment out uniqueHashCode. This will not cause a db4o reset, we can remove 
fields without any trouble.


Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java      2009-04-02 17:23:00 UTC 
(rev 26367)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java      2009-04-02 17:31:08 UTC 
(rev 26368)
@@ -83,7 +83,7 @@
        private final long suggestedEdition; // for USKs
        private boolean hasHashCode;
        private int hashCode;
-       private final int uniqueHashCode;
+//     private final int uniqueHashCode;
        static final String[] VALID_KEY_TYPES =
                new String[]{"CHK", "SSK", "KSK", "USK"};
 
@@ -158,7 +158,7 @@
        }
 
        public FreenetURI(FreenetURI uri) {
-               this.uniqueHashCode = super.hashCode();
+//             this.uniqueHashCode = super.hashCode();
                keyType = uri.keyType;
                docName = uri.docName;
                if(uri.metaStr != null) {
@@ -218,7 +218,7 @@
                String[] metaStr,
                byte[] routingKey,
                byte[] cryptoKey, byte[] extra2) {
-               this.uniqueHashCode = super.hashCode();
+//             this.uniqueHashCode = super.hashCode();
                this.keyType = keyType.trim().toUpperCase().intern();
                this.docName = docName;
                this.metaStr = metaStr;
@@ -237,7 +237,7 @@
                byte[] routingKey,
                byte[] cryptoKey, byte[] extra2,
                long suggestedEdition) {
-               this.uniqueHashCode = super.hashCode();
+//             this.uniqueHashCode = super.hashCode();
                this.keyType = keyType.trim().toUpperCase().intern();
                this.docName = docName;
                this.metaStr = metaStr;
@@ -252,7 +252,7 @@
        protected final static Pattern URI_PREFIX = 
Pattern.compile("^(http://[^/]+/+)?(freenet:)?");
        
        public FreenetURI(String URI) throws MalformedURLException {
-               this.uniqueHashCode = super.hashCode();
+//             this.uniqueHashCode = super.hashCode();
                if(URI == null)
                        throw new MalformedURLException("No URI specified");
                
@@ -387,7 +387,7 @@
 
        /** USK constructor from components. */
        public FreenetURI(byte[] pubKeyHash, byte[] cryptoKey, byte[] extra, 
String siteName, long suggestedEdition2) {
-               this.uniqueHashCode = super.hashCode();
+//             this.uniqueHashCode = super.hashCode();
                this.keyType = "USK";
                this.routingKey = pubKeyHash;
                this.cryptoKey = cryptoKey;

_______________________________________________
cvs mailing list
cvs@freenetproject.org
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs