[Gzz-commits] storm/org/nongnu/storm StormPool.meta impl/p2p/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/13 10:40:28

Modified files:
        org/nongnu/storm: StormPool.meta 
        org/nongnu/storm/impl/p2p: P2PPool.java 
        org/nongnu/storm/pointers: PointerId.java 

Log message:
        run even if DSA is not available (but pointers don't work)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/StormPool.meta.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/p2p/P2PPool.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/PointerId.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/StormPool.meta
diff -u storm/org/nongnu/storm/StormPool.meta:1.9 
storm/org/nongnu/storm/StormPool.meta:1.10
--- storm/org/nongnu/storm/StormPool.meta:1.9   Wed Apr 23 03:17:16 2003
+++ storm/org/nongnu/storm/StormPool.meta       Tue May 13 10:40:28 2003
@@ -174,6 +174,8 @@
         
     newIds = HashSet(pool.getIds())
 
+    pool.get(bos.getBlockId())
+
     assert oldIds != newIds
     assert newIds.contains(bos.getBlockId())
     
@@ -198,6 +200,14 @@
     except FileNotFoundException: pass
     else: assert 0
     
+def testFoo():
+    bos = pool.getBlockOutputStream("text/plain")
+    osw = OutputStreamWriter(bos)
+    osw.write("Hallo, Welt!")
+    osw.close()
+    bos.close()
+    
+    pool.get(bos.getBlockId())
 
 def testBlockId():
     """
Index: storm/org/nongnu/storm/impl/p2p/P2PPool.java
diff -u storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.9 
storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.10
--- storm/org/nongnu/storm/impl/p2p/P2PPool.java:1.9    Tue May 13 09:44:19 2003
+++ storm/org/nongnu/storm/impl/p2p/P2PPool.java        Tue May 13 10:40:28 2003
@@ -68,8 +68,17 @@
                try {
                    p("Trying to connect to: " + url);
                    URLConnection conn = new URL(url).openConnection();
+                   conn.connect();
+                   for(int x=0;;x++) {
+                       Object o = conn.getHeaderField(x);
+                       if(o == null) break;
+                       p("HF: "+o);
+                   }
+                   p("conn");
                    String contentType = conn.getContentType();             
+                   p("gettype");
                    if(contentType == null) continue;
+                   p("hastype");
 
                    // The content type may contain spaces like this:
                    // "text/html; charset=utf-8"
@@ -80,9 +89,12 @@
                        contentType = contentType.substring(0, sp) +
                                      contentType.substring(sp+1);
 
+                   p("sp removed");
                    BlockOutputStream bos = 
                        cache.getBlockOutputStream(contentType);
+                   p("bos");
                    CopyUtil.copy(conn.getInputStream(), bos);
+                   p("copied");
                    if(bos.getBlockId().equals(id)) { 
                        p("Block found @ " + url);
                        return bos.getBlock();
Index: storm/org/nongnu/storm/pointers/PointerId.java
diff -u storm/org/nongnu/storm/pointers/PointerId.java:1.4 
storm/org/nongnu/storm/pointers/PointerId.java:1.5
--- storm/org/nongnu/storm/pointers/PointerId.java:1.4  Fri May  9 14:35:03 2003
+++ storm/org/nongnu/storm/pointers/PointerId.java      Tue May 13 10:40:28 2003
@@ -39,13 +39,13 @@
     public static String PREFIX = "urn:x-storm:pointer-0.1:";
     public static int PREFIX_LEN = PREFIX.length();
 
-    static final KeyFactory keyFactory;
+    static KeyFactory keyFactory;
     static {
        try {
            keyFactory = KeyFactory.getInstance("DSA");
        } catch(NoSuchAlgorithmException e) {
            e.printStackTrace();
-           throw new Error("PointerId needs DSA algorithm");
+           //throw new Error("PointerId needs DSA algorithm");
        }
     }
     private static SecureRandom random = new SecureRandom();
@@ -124,6 +124,7 @@
 
     public static byte[] getKeyBytes(PublicKey key)    
        throws InvalidKeyException, InvalidKeySpecException {
+       if(keyFactory == null) throw new Error("PointerId needs DSA algorithm");
        key = (PublicKey)keyFactory.translateKey(key);
        EncodedKeySpec keySpec = 
            (EncodedKeySpec)keyFactory.getKeySpec(key, 
X509EncodedKeySpec.class);