[Gzz-commits] gzz/gzz/mediaserver MediaserverFiler.java

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/07 18:08:33

Modified files:
        gzz/mediaserver: MediaserverFiler.java 

Log message:
        twid

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -u gzz/gzz/mediaserver/MediaserverFiler.java:1.14 
gzz/gzz/mediaserver/MediaserverFiler.java:1.15
--- gzz/gzz/mediaserver/MediaserverFiler.java:1.14      Sat Nov 16 09:07:33 2002
+++ gzz/gzz/mediaserver/MediaserverFiler.java   Sat Dec  7 18:08:33 2002
@@ -174,13 +174,15 @@
 
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        fmt.writeVersion(bos, v);
-       Mediaserver.Id diffTo = ms.addDatum(bos.toByteArray(),
+       byte[] currentBytes = bos.toByteArray();
+       Mediaserver.Id diffTo = ms.addDatum(currentBytes,
                                             versionContentType, current);
 
         String headerTo = ms.getDatum(diffTo).getRawHeader();
        if(!diffTo.equals(getVersionId(v, headerTo)))
            throw new Error("BAD INTERNAL ERROR: Block id recreation failed");
 
+       Mediaserver.Id was_current = current;
        current = diffTo;
        ms.setPointer(pointer, current);
 
@@ -216,8 +218,16 @@
            fmt.writeVersion(bos, v);
            Mediaserver.Id nid = ms.addDatum(bos.toByteArray(),
                         versionContentType, current);
-            if(!nid.equals(current))
+            if(!nid.equals(current)) {
+               Mediaserver.Id diffTo = ms.addDatum(currentBytes,
+                                                   versionContentType, 
was_current);
+                pa("============ AAAARGH =============");
+                pa(new String(bos.toByteArray()));
+                pa("============== WAS ===============");
+               pa(new String(currentBytes));
+                pa("==================================");
                 throw new Error("AAAAAAAAAAAAAAAAAAAAAAAAAAAAARGH!!!");
+           }
             if(true) {
                 pa("============ CORRECT =============");
                 pa(new String(bos.toByteArray()));