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

[Martin Zaun]

 4245 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
 4244 Craig L Russell	2011-07-05
      change clusterj version from 7.1.15 to 7.1.16

    modified:
      storage/ndb/clusterj/clusterj-api/pom.xml
      storage/ndb/clusterj/clusterj-bindings/pom.xml
      storage/ndb/clusterj/clusterj-core/pom.xml
      storage/ndb/clusterj/clusterj-jdbc/pom.xml
      storage/ndb/clusterj/clusterj-jpatest/pom.xml
      storage/ndb/clusterj/clusterj-openjpa/pom.xml
      storage/ndb/clusterj/clusterj-test/pom.xml
      storage/ndb/clusterj/clusterj-tie/pom.xml
      storage/ndb/clusterj/pom.xml
=== 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-05 17:40:22 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/jtie_tconv_idcache_impl.hpp	2011-07-06 06:16:40 +0000
@@ -196,9 +196,17 @@ 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
+
+//#ifndef NDEBUG // XXX for debugging
+            // print error diagnostics
+            char m[256];
+            snprintf(m, 256, "JTie: failed to find Java class '%s'\n",
+                     (C::class_name == NULL ? "NULL" : C::class_name));
+            fprintf(stderr, m);
+            env->ExceptionDescribe();
+            env->FatalError(m); // XXX for debugging
+//#endif // NDEBUG
         } else {
             assert(env->ExceptionCheck() == JNI_OK); // ok
         }
@@ -337,7 +345,6 @@ struct MemberIdStrongCache : MemberIdCac
             } else {
                 setClass(env, cls);
             }
-            setClass(env, cls);
         }
         return cls;
     }

No bundle (reason: useless for push emails).