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

[SVN commits to the Hydra project]

Author: beagles
Date: Mon May 24 21:31:07 2010
New Revision: 639

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=639
Log:
removing offending cut'n'paste error

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=639&r1=638&r2=639
==============================================================================
--- ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java (original)
+++ ice/branches/preserve-graphs/java/src/Ice/SkippedSlice.java Mon May 24 21:31:07 2010
@@ -8,6 +8,7 @@
     public static void updateObjectId(byte[] blob, int offset, int id)
     {
 	java.nio.ByteBuffer buf = java.nio.ByteBuffer.wrap(blob);
+        buf.order(java.nio.ByteOrder.LITTLE_ENDIAN);
 	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=639&r1=638&r2=639
==============================================================================
--- ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java (original)
+++ ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java Mon May 24 21:31:07 2010
@@ -460,13 +460,15 @@
 	    {
 		try
 		{
-		    newSlice.slice = new byte[returnTo - _currentObjectStart];
+                    byte[] b = new byte[returnTo - _currentObjectStart];
 		    _buf.b.position(_currentObjectStart);
-		    _buf.b.get(newSlice.slice);
+                    _buf.b.get(b);
+                    newSlice.slice = b;
 		}
 		catch(Exception ex)
 		{
 		    ex.printStackTrace();
+                    throw new Ice.MarshalException("error in skipSlice");
 		}
 	    }
 	    finally
@@ -1857,7 +1859,6 @@
                 }
                 p = q;
             }
-            writeInt(p.intValue());
 	    return p.intValue();
         }
 	return 0;