Minor JNI-related doc tweaks and code re-ordering.

FossilOrigin-Name: b663b27e425966f34fb62482a18048f0e2934380e5c411ae3627f1fe6a765c04

diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c
index ee389d40320356ae44cddb2b3544f2826c03cde0..e2993c31c86d3fd4fba839a88ff6f501ff271da8 100644 (file)
--- a/ext/jni/src/c/sqlite3-jni.c
+++ b/ext/jni/src/c/sqlite3-jni.c
@@ -2296,12 +2296,12 @@ static int s3jni_trace_impl(unsigned traceflag, void *pC, void *pP, void *pX){
   rc = (int)(*env)->CallIntMethod(env, ps->trace.jObj,
                                   ps->trace.midCallback,
                                   (jint)traceflag, jP, jX);
-  UNREF_L(jPUnref);
-  UNREF_L(jX);
   IFTHREW{
     EXCEPTION_WARN_CALLBACK_THREW1("sqlite3_trace_v2() callback");
     rc = SQLITE_ERROR;
   }
+  UNREF_L(jPUnref);
+  UNREF_L(jX);
   return rc;
 }
 

diff --git a/ext/jni/src/org/sqlite/jni/Tester1.java b/ext/jni/src/org/sqlite/jni/Tester1.java
index 23bd038348228ba00a253749ddd95387d274a3ac..69bf30756f257577c04c887f3fd48367c0082c99 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/Tester1.java
+++ b/ext/jni/src/org/sqlite/jni/Tester1.java
@@ -433,12 +433,12 @@ public class Tester1 {
        encoding while also claiming to export using RFC 2279:
 
        https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html
+
+       Let's ensure that we can convert to standard UTF-8 in Java code
+       (noting that the JNI native API has no way to do this).
     */
     final byte[] ba = "a \0 b".getBytes(StandardCharsets.UTF_8);
-    //out("\"a NUL b\" via getBytes(): ");
     affirm( 5 == ba.length /* as opposed to 6 in modified utf-8 */);
-    //for( byte b : ba ) out( ""+b );
-    //outln("");
   }
 
   private static void testUdf1(){
@@ -452,9 +452,7 @@ public class Tester1 {
     SQLFunction func =
       // Each of the 3 subclasses requires a different set of
       // functions, all of which must be implemented.  Anonymous
-      // classes are a convenient way to implement these, though the
-      // result is possibly somewhat noisy for those not at home in
-      // Java...
+      // classes are a convenient way to implement these.
       new SQLFunction.Scalar(){
         public void xFunc(sqlite3_context cx, sqlite3_value[] args){
           affirm(db == sqlite3_context_db_handle(cx));

diff --git a/manifest b/manifest
index dcd27fee56dcf1333e5b9913825fb7fbff0d8bf8..161ddef685980d10ed730e224a1cdb8de2f00df2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimentally\schange\sthe\sJNI\ssqlite3_trace_v2()\scallback\stype\sto\shave\smore\sconvenient\saccess\sto\sthe\scurrent\sJava-side\ssqlite3_stmt\sat\sthe\scost\sof\ssome\suncomfortably\sfiddly\scurrent-statement\stracking\sin\sthe\sJNI\slayer.\sSubject\sto\schange.
-D 2023-07-31T13:52:46.522
+C Minor\sJNI-related\sdoc\stweaks\sand\scode\sre-ordering.
+D 2023-08-01T08:48:13.434
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -232,7 +232,7 @@ F ext/icu/icu.c c074519b46baa484bb5396c7e01e051034da8884bad1a1cb7f09bbe6be3f0282
 F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a32075a8
 F ext/jni/GNUmakefile 3d1f106e7a08bb54279c12979b31492b3dea702a732eab445dbc765120995182
 F ext/jni/README.md c0e6e80935e7761acead89b69c87765b23a6bcb2858c321c3d05681fd338292a
-F ext/jni/src/c/sqlite3-jni.c 4d680b84d7def871186e0787cbaa14347952c1c4ea05530440bb237a7a97886c
+F ext/jni/src/c/sqlite3-jni.c c67b9ae6ee3eda2c89523ccddc6fd98bc610c3ac1c55dfdca2971587ff4795ef
 F ext/jni/src/c/sqlite3-jni.h 74aaf87e77f99857aa3afc013517c934cbc2c16618c83d8f5d6294351bc8e7b1
 F ext/jni/src/org/sqlite/jni/BusyHandler.java 1b1d3e5c86cd796a0580c81b6af6550ad943baa25e47ada0dcca3aff3ebe978c
 F ext/jni/src/org/sqlite/jni/Collation.java 8dffbb00938007ad0967b2ab424d3c908413af1bbd3d212b9c9899910f1218d1
@@ -244,7 +244,7 @@ F ext/jni/src/org/sqlite/jni/ProgressHandler.java 5979450e996416d28543f1d42634d3
 F ext/jni/src/org/sqlite/jni/RollbackHook.java b04c8abcc6ade44a8a57129e33765793f69df0ba909e49ba18d73f4268d92564
 F ext/jni/src/org/sqlite/jni/SQLFunction.java 663a4e479ec65bfbf893586439e12d30b8237898064a22ab64f5658b57315f37
 F ext/jni/src/org/sqlite/jni/SQLite3Jni.java b522c6456ab66026af5c487e4ac40410be36374d0550c2a03ea28421c4d39029
-F ext/jni/src/org/sqlite/jni/Tester1.java ee7ad9a45a282b12a5c2c5ab5f6fdb14a398f854f29cdeef457c81cceeddad16
+F ext/jni/src/org/sqlite/jni/Tester1.java 9443cdbd2b10f6a8e1f3abd1694983a16b17960f8ed2f7e06bcc7e535fb5abcf
 F ext/jni/src/org/sqlite/jni/Tracer.java a5cece9f947b0af27669b8baec300b6dd7ff859c3e6a6e4a1bd8b50f9714775d
 F ext/jni/src/org/sqlite/jni/UpdateHook.java e58645a1727f8a9bbe72dc072ec5b40d9f9362cb0aa24acfe93f49ff56a9016d
 F ext/jni/src/org/sqlite/jni/ValueHolder.java f022873abaabf64f3dd71ab0d6037c6e71cece3b8819fa10bf26a5461dc973ee
@@ -2071,8 +2071,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a5d68a6b64abe3c2dfc3a32157f70fd8a4ad89feef2510b3bbb2d86b325d51ae
-R cb629a46215e7de4fde069b749d0908e
+P 459db332af6ea358b42bac096b9d26f1045b9ec32fad8463bca06807b2396b2c
+R 2116d1859999fef41708d9f5ffc75a3f
 U stephan
-Z 8e74ea4537f0e72a50fc3ee99cfef378
+Z e9112cb724b07771e50f3afa4c070a7b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bd9b7db410b1fe7e6deb6a43bbfb799afc671e5b..1de4eef727749117020175b31830fd8f33d5d5c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-459db332af6ea358b42bac096b9d26f1045b9ec32fad8463bca06807b2396b2c
\ No newline at end of file
+b663b27e425966f34fb62482a18048f0e2934380e5c411ae3627f1fe6a765c04
\ No newline at end of file