[X10-commits] SF.net SVN: x10:[14334] trunk/x10.runtime/src-x10/x10/io/Marshal.x10

[<mt...@us...>]

Revision: 14334
          http://x10.svn.sourceforge.net/x10/?rev=14334&view=rev
Author:   mtake
Date:     2010-05-30 17:50:23 +0000 (Sun, 30 May 2010)

Log Message:
-----------
Fix for XTENLANG-1399

Modified Paths:
--------------
    trunk/x10.runtime/src-x10/x10/io/Marshal.x10

Modified: trunk/x10.runtime/src-x10/x10/io/Marshal.x10
===================================================================
--- trunk/x10.runtime/src-x10/x10/io/Marshal.x10	2010-05-30 04:49:12 UTC (rev 14333)
+++ trunk/x10.runtime/src-x10/x10/io/Marshal.x10	2010-05-30 17:50:23 UTC (rev 14334)
@@ -129,7 +129,7 @@
         public global def read(r: Reader): Short throws IOException {
             val b1 = r.read();
             val b2 = r.read();
-            return (((b1 & 0xff) << 8) | b2) as Short;
+            return (((b1 & 0xff) << 8) | (b2 & 0xff)) as Short;
         }
 
         public global def write(w: Writer, s: Short): Void throws IOException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.