bzr commit into clusterj branch (Craig.Russell:343)

[Craig L Russell]

#At file:///Users/clr/ndb/root/clusterj-working/ based on revid:craig.russell@stripped

  343 Craig L Russell	2010-10-27
      Fix NPE on null key (generated identity)

    modified:
      clusterj-openjpa/crundRun.properties
      clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java
=== modified file 'clusterj-openjpa/crundRun.properties'
--- a/clusterj-openjpa/crundRun.properties	2009-06-26 17:30:33 +0000
+++ b/clusterj-openjpa/crundRun.properties	2010-10-27 23:17:25 +0000
@@ -6,26 +6,26 @@ includeFullGC=false
 logSumOfOps=true
 
 # the number of rows for tables A in a transaction and a scale factor
-#aStart=10
+aStart=10
 #aStart=256
-aStart=1024
+#aStart=1024
 #aStart=4096
-#aEnd=10
+aEnd=10
 #aEnd=256
-aEnd=1024
+#aEnd=1024
 #aEnd=4096
 #aEnd=16384
 #aEnd=65536
 aIncr=4
 
 # the number of rows for tables B0 in a transaction and a scale factor
-#bStart=10
+bStart=10
 #bStart=256
-bStart=1024
+#bStart=1024
 #bStart=4096
-#bEnd=40
+bEnd=10
 #bEnd=256
-bEnd=1024
+#bEnd=1024
 #bEnd=4096
 #bEnd=16384
 #bEnd=65536
@@ -44,7 +44,7 @@ renewConnection=false
 allowExtendedPC=false
 
 # the number of warmup and finally recorded runs
-warmupRuns=1
+warmupRuns=0
 hotRuns=1
 
 # CURRENT LIMITS:

=== modified file 'clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java'
--- a/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java	2010-04-22 05:04:54 +0000
+++ b/clusterj-openjpa/src/main/java/com/mysql/clusterj/openjpa/NdbOpenJPADomainFieldHandlerImpl.java	2010-10-27 23:17:25 +0000
@@ -873,8 +873,9 @@ public class NdbOpenJPADomainFieldHandle
                 throw new UnsupportedOperationException(
                         local.message("ERR_Unsupported_Object_Id_Type", "int key", "OpenJPAId"));
             } else {
+                String message = (objectId == null)?"<null>":objectId.getClass().getName();
                 throw new UnsupportedOperationException(
-                        local.message("ERR_Unsupported_Object_Id_Type", "int key", objectId.getClass().getName()));
+                        local.message("ERR_Unsupported_Object_Id_Type", "int key", message));
             }
         }
 
@@ -891,8 +892,9 @@ public class NdbOpenJPADomainFieldHandle
                 throw new UnsupportedOperationException(
                         local.message("ERR_Unsupported_Object_Id_Type", "long key", "OpenJPAId"));
             } else {
+                String message = (objectId == null)?"<null>":objectId.getClass().getName();
                 throw new UnsupportedOperationException(
-                        local.message("ERR_Unsupported_Object_Id_Type", "long key", objectId.getClass().getName()));
+                        local.message("ERR_Unsupported_Object_Id_Type", "long key", message));
             }
         }
 
@@ -909,8 +911,9 @@ public class NdbOpenJPADomainFieldHandle
                 throw new UnsupportedOperationException(
                         local.message("ERR_Unsupported_Object_Id_Type", "String key", "OpenJPAId"));
             } else {
+                String message = (objectId == null)?"<null>":objectId.getClass().getName();
                 throw new UnsupportedOperationException(
-                        local.message("ERR_Unsupported_Object_Id_Type", "String key", objectId.getClass().getName()));
+                        local.message("ERR_Unsupported_Object_Id_Type", "String key", message));
             }
         }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]