[hydra-commits] beagles: branch ice/preserve-graphs r637 - in /ice/branches/preserve-graphs/j...

[SVN commits to the Hydra project]

Author: beagles
Date: Mon May 24 15:16:59 2010
New Revision: 637

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=637
Log:
fix aliasing bug and line removed by mistake

Modified:
    ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java
    ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java

Modified: ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java?view=diff&rev=637&r1=636&r2=637
==============================================================================
--- ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java (original)
+++ ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java Mon May 24 15:16:59 2010
@@ -7,8 +7,8 @@
 
     public static void updateObjectId(byte[] blob, int offset, int id)
     {
+	System.err.println("Updating blob at offset " + offset + " with id " + id);
 	java.nio.ByteBuffer buf = java.nio.ByteBuffer.wrap(blob);
-	buf.position(offset);
-	buf.putInt(id);
+	buf.putInt(offset, id);
     }
 }

Modified: ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java?view=diff&rev=637&r1=636&r2=637
==============================================================================
--- ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java (original)
+++ ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java Mon May 24 15:16:59 2010
@@ -656,7 +656,7 @@
     public java.util.ArrayList<Ice.SkippedSlice>
     getSkippedSlices()
     {
-	return _skippedSlices;
+	return new java.util.ArrayList<Ice.SkippedSlice>(_skippedSlices);
     }
 
     public byte[]
@@ -1858,6 +1858,7 @@
                 p = q;
             }
             writeInt(p.intValue());
+	    return p.intValue();
         }
 	return 0;
     }