r9787 - helma-ng/trunk/modules

[email protected] Fri, 15 May 2009 13:20:44 +0200 (CEST)
Newsgroups gmane.comp.java.helma.cvs
Message-ID <20090515112044.E64613D0D6@mia>
Author: hannes
Date: 2009-05-15 13:20:44 +0200 (Fri, 15 May 2009)
New Revision: 9787

Modified:
   helma-ng/trunk/modules/io.js
Log:
Fix bug reported by Simon Oberhammer: don't use java.util.Arrays.copyOf() as this method isn't available in Java < 1.6

Details at http://dev.helma.org/trac/helma/changeset/9787

Modified: helma-ng/trunk/modules/io.js
===================================================================
--- helma-ng/trunk/modules/io.js	2009-05-15 11:20:41 UTC (rev 9786)
+++ helma-ng/trunk/modules/io.js	2009-05-15 11:20:44 UTC (rev 9787)
@@ -47,12 +47,14 @@
     
     var resultBuffer, resultLength;
     
-    if (bytes)
+    if (bytes) {
         resultBuffer = bytes.toByteArray();
-    else if (total < buffer.length)
-        resultBuffer = java.util.Arrays.copyOf(buffer, total);
-    else
+    } else if (total < buffer.length) {
+        resultBuffer = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, total);
+        java.lang.System.arraycopy(buffer, 0, resultBuffer, 0, total);
+    } else {
         resultBuffer = buffer;
+    }
     
     resultLength = resultBuffer.length;