r27224 - trunk/contrib/fec/src/csrc

Author: j16sdiz
Date: 2009-04-23 03:55:06 +0000 (Thu, 23 Apr 2009)
New Revision: 27224

Modified:
   trunk/contrib/fec/src/csrc/fec16-jinterf.c
   trunk/contrib/fec/src/csrc/fec8-jinterf.c
Log:
Revert r26869 "Use GetByteArrayElements() not GetPrimitiveArrayCritical()"

Modified: trunk/contrib/fec/src/csrc/fec16-jinterf.c
===================================================================
--- trunk/contrib/fec/src/csrc/fec16-jinterf.c	2009-04-23 01:41:30 UTC (rev 27223)
+++ trunk/contrib/fec/src/csrc/fec16-jinterf.c	2009-04-23 03:55:06 UTC (rev 27224)
@@ -70,7 +70,7 @@
 				return; /* exception occured */
 			}
 
-		inarr[i] = (*env)->GetByteArrayElements(env, inArr[i], 0);
+		inarr[i] = (*env)->GetPrimitiveArrayCritical(env, inArr[i], 0); 
         if (inarr[i] == NULL) {
             return; /* exception occured */
         }
@@ -83,7 +83,7 @@
             return; /* exception occured */
         }
 
-		retarr[i] = (*env)->GetByteArrayElements(env, retArr[i], 0);
+		retarr[i] = (*env)->GetPrimitiveArrayCritical(env, retArr[i], 0); 
         if (retarr[i] == NULL) {
             return; /* exception occured */
         }
@@ -96,13 +96,13 @@
     }
 
     for (i=0;i<k;i++) {
-        inarr[i] -= localSrcOff[i];
-		(*env)->ReleaseByteArrayElements(env, inArr[i], inarr[i], 0);
-    }
-
+        inarr[i] -= localSrcOff[i]; 
+		(*env)->ReleasePrimitiveArrayCritical(env, inArr[i], inarr[i], 0);
+    } 
+ 
     for (i=0;i<numRet;i++) {
         retarr[i] -= localRetOff[i];
-		(*env)->ReleaseByteArrayElements(env, retArr[i], retarr[i], 0);
+		(*env)->ReleasePrimitiveArrayCritical(env, retArr[i], retarr[i], 0); 
     }
 
     (*env)->ReleaseIntArrayElements(env, srcOff, localSrcOff, 0);
@@ -156,7 +156,7 @@
         if (inArr[i] == NULL) {
             return;  /* exception occured */
         }
-	inarr[i] = (*env)->GetByteArrayElements(env, inArr[i], 0);
+	inarr[i] = (*env)->GetPrimitiveArrayCritical(env, inArr[i], 0); 
         if (inarr[i] == NULL) {
             return;  /* exception occured */
         }
@@ -171,7 +171,7 @@
     }
 
     for (i = 0; i < k; i++) {
-		(*env)->ReleaseByteArrayElements(env, inArr[i], inarr[i], 0);
+		(*env)->ReleasePrimitiveArrayCritical(env, inArr[i], inarr[i], 0); 
     }
 
     (*env)->ReleaseIntArrayElements(env, whichdata, localWhich, 0);

Modified: trunk/contrib/fec/src/csrc/fec8-jinterf.c
===================================================================
--- trunk/contrib/fec/src/csrc/fec8-jinterf.c	2009-04-23 01:41:30 UTC (rev 27223)
+++ trunk/contrib/fec/src/csrc/fec8-jinterf.c	2009-04-23 03:55:06 UTC (rev 27224)
@@ -70,7 +70,7 @@
 				return; /* exception occured */
 			}
 
-		inarr[i] = (*env)->GetByteArrayElements(env, inArr[i], 0);
+		inarr[i] = (*env)->GetPrimitiveArrayCritical(env, inArr[i], 0); 
         if (inarr[i] == NULL) {
             return; /* exception occured */
         }
@@ -83,7 +83,7 @@
             return; /* exception occured */
         }
 
-		retarr[i] = (*env)->GetByteArrayElements(env, retArr[i], 0);
+		retarr[i] = (*env)->GetPrimitiveArrayCritical(env, retArr[i], 0); 
         if (retarr[i] == NULL) {
             return; /* exception occured */
         }
@@ -96,13 +96,13 @@
     }
 
     for (i=0;i<k;i++) {
-        inarr[i] -= localSrcOff[i];
-		(*env)->ReleaseByteArrayElements(env, inArr[i], inarr[i], 0);
-    }
-
+        inarr[i] -= localSrcOff[i]; 
+		(*env)->ReleasePrimitiveArrayCritical(env, inArr[i], inarr[i], 0);
+    } 
+ 
     for (i=0;i<numRet;i++) {
         retarr[i] -= localRetOff[i];
-		(*env)->ReleaseByteArrayElements(env, retArr[i], retarr[i], 0);
+		(*env)->ReleasePrimitiveArrayCritical(env, retArr[i], retarr[i], 0); 
     }
 
     (*env)->ReleaseIntArrayElements(env, srcOff, localSrcOff, 0);
@@ -156,7 +156,7 @@
         if (inArr[i] == NULL) {
             return;  /* exception occured */
         }
-	inarr[i] = (*env)->GetByteArrayElements(env, inArr[i], 0);
+	inarr[i] = (*env)->GetPrimitiveArrayCritical(env, inArr[i], 0); 
         if (inarr[i] == NULL) {
             return;  /* exception occured */
         }
@@ -171,7 +171,7 @@
     }
 
     for (i = 0; i < k; i++) {
-		(*env)->ReleaseByteArrayElements(env, inArr[i], inarr[i], 0);
+		(*env)->ReleasePrimitiveArrayCritical(env, inArr[i], inarr[i], 0); 
     }
 
     (*env)->ReleaseIntArrayElements(env, whichdata, localWhich, 0);