diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index 9b8ab2fef..077668e48 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -264,15 +264,8 @@
   bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      $1 = ($1 << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      $1 = ($1 << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    $1 = ($1 << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -295,15 +288,8 @@
   bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      $1 = ($1 << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      $1 = ($1 << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    $1 = ($1 << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -507,15 +493,8 @@
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = &temp;
   temp = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
@@ -540,15 +519,8 @@
   sz = JCALL1(GetArrayLength, jenv, ba);
   $1 = &temp;
   temp = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
 }
diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i
index a5c3bbfc6..b6b75826f 100644
--- a/Lib/java/typemaps.i
+++ b/Lib/java/typemaps.i
@@ -124,15 +124,8 @@ INPUT_TYPEMAP(double, jdouble, double, "D");
   bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
   sz = JCALL1(GetArrayLength, jenv, ba);
   temp = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
   $1 = &temp;
@@ -422,15 +415,8 @@ INOUT_TYPEMAP(double, jdouble, double, Double, "[Ljava/lang/Double;", jdoubleArr
   bae = JCALL2(GetByteArrayElements, jenv, ba, 0);
   sz = JCALL1(GetArrayLength, jenv, ba);
   temp = 0;
-  if (bae[0] == 0) {
-    for(i=sz-1; i>0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-i];
-    }
-  } 
-  else {
-    for(i=sz; i>=0; i-- ) {
-      temp = (temp << 8) | (unsigned char)bae[sz-1-i];
-    }
+  for(i=0; i<sz; i++) {
+    temp = (temp << 8) | (unsigned long long)(unsigned char)bae[i];
   }
   JCALL3(ReleaseByteArrayElements, jenv, ba, bae, 0);
   $1 = &temp;