[Gzz-commits] gzz/lava/gzz/storm impl/AbstractPool.java impl/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/01/18 19:55:59

Modified files:
        lava/gzz/storm/impl: AbstractPool.java DirPool.java 
                             TransientPool.java ZipPool.java 
        lava/gzz/storm/util: DiffingStormFiler.java 

Log message:
        Fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/AbstractPool.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/DirPool.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/TransientPool.java.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/impl/ZipPool.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/storm/util/DiffingStormFiler.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/storm/impl/AbstractPool.java
diff -u gzz/lava/gzz/storm/impl/AbstractPool.java:1.14 
gzz/lava/gzz/storm/impl/AbstractPool.java:1.15
--- gzz/lava/gzz/storm/impl/AbstractPool.java:1.14      Tue Jan 14 10:43:05 2003
+++ gzz/lava/gzz/storm/impl/AbstractPool.java   Sat Jan 18 19:55:59 2003
@@ -91,13 +91,15 @@
     }
 
     /**
-     *  <code>block</code> must be set by <code>close()</code>.
+     *  <code>block</code> and <code>closed</code>
+     *  must be set by <code>close()</code>.
      */
     protected abstract class AbstractBlockOutputStream 
        extends BlockOutputStream {
 
        protected Header822 header;
        protected Block block;
+       protected boolean closed = false;
 
        /** Create a new AbstractBlockOutputStream object
         *  and write the given header to it.
Index: gzz/lava/gzz/storm/impl/DirPool.java
diff -u gzz/lava/gzz/storm/impl/DirPool.java:1.22 
gzz/lava/gzz/storm/impl/DirPool.java:1.23
--- gzz/lava/gzz/storm/impl/DirPool.java:1.22   Tue Jan 14 10:43:06 2003
+++ gzz/lava/gzz/storm/impl/DirPool.java        Sat Jan 18 19:55:59 2003
@@ -74,7 +74,10 @@
         }
 
        public void close() throws IOException {
+           if(closed) return;
+
            out.close();
+           closed = true;
            
            BlockId id = makeIdFromDigest();
            File file = getFile(id);
Index: gzz/lava/gzz/storm/impl/TransientPool.java
diff -u gzz/lava/gzz/storm/impl/TransientPool.java:1.25 
gzz/lava/gzz/storm/impl/TransientPool.java:1.26
--- gzz/lava/gzz/storm/impl/TransientPool.java:1.25     Sat Jan 18 19:24:36 2003
+++ gzz/lava/gzz/storm/impl/TransientPool.java  Sat Jan 18 19:55:59 2003
@@ -48,6 +48,9 @@
         }
 
        public void close() throws IOException {
+           if(closed) return;
+           closed = true;
+
            ByteArrayOutputStream baos = (ByteArrayOutputStream)out;
            block = new TransientBlock(makeIdFromDigest(),
                                       baos.toByteArray(), header);
Index: gzz/lava/gzz/storm/impl/ZipPool.java
diff -u gzz/lava/gzz/storm/impl/ZipPool.java:1.13 
gzz/lava/gzz/storm/impl/ZipPool.java:1.14
--- gzz/lava/gzz/storm/impl/ZipPool.java:1.13   Tue Jan 14 10:43:06 2003
+++ gzz/lava/gzz/storm/impl/ZipPool.java        Sat Jan 18 19:55:59 2003
@@ -52,7 +52,10 @@
           }
 
           public void close() throws IOException {
+             if(closed) return;
              baos.close();
+             closed = true;
+
              BlockId id = makeIdFromDigest();
              changeZipFile(null, baos.toByteArray(), id);
              block = get(id);
Index: gzz/lava/gzz/storm/util/DiffingStormFiler.java
diff -u gzz/lava/gzz/storm/util/DiffingStormFiler.java:1.4 
gzz/lava/gzz/storm/util/DiffingStormFiler.java:1.5
--- gzz/lava/gzz/storm/util/DiffingStormFiler.java:1.4  Sat Jan 18 18:56:36 2003
+++ gzz/lava/gzz/storm/util/DiffingStormFiler.java      Sat Jan 18 19:55:59 2003
@@ -25,7 +25,6 @@
            return super.load(id);
        } catch(FileNotFoundException _) {
            Set diffs = index.getDiffBlocksTo(id, format);
-           System.out.println("ndiffs: "+diffs.size());
            for(Iterator i=diffs.iterator(); i.hasNext();) {
                try {
                    DiffBlock diffBlock = (DiffBlock)i.next();