bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4241 to 4242)

[Martin Zaun]

 4242 Martin Zaun	2011-07-05 [merge]
      merge from ndb-7.1-jtie to ndb-7.1

    modified:
      storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp
 4241 Craig L Russell	2011-07-05
      Insert only modified values

    modified:
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
=== modified file 'storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp'
--- a/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp	2011-07-04 15:58:21 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp	2011-07-05 17:40:22 +0000
@@ -196,6 +196,8 @@ struct MemberId {
         assert(env->ExceptionCheck() == JNI_OK);
         jclass cls = env->FindClass(C::class_name);
         if (cls == NULL) { // break out for better diagnostics
+            // XXX better handle error diagnostocs
+            printf("JTie: failed to find Java class '%s'\n", C::class_name);
             assert(env->ExceptionCheck() != JNI_OK); // exception pending
         } else {
             assert(env->ExceptionCheck() == JNI_OK); // ok
@@ -330,6 +332,11 @@ struct MemberIdStrongCache : MemberIdCac
         jclass cls = Base::gClassRef;
         if (cls == NULL) {
             cls = A::getClass(env);
+            if (cls == NULL) {
+                // exception pending
+            } else {
+                setClass(env, cls);
+            }
             setClass(env, cls);
         }
         return cls;

No bundle (reason: useless for push emails).