6505802 test suite failure: tst.Bean.ksh

6505806 test suite failure: tst.MultiAggPrinta.ksh
6506495 -DJAVA_DTRACE_MAX_CONSUMERS=N for any N < 8 is treated as if it were 8

4 files changed, 12 insertions, 16 deletions

diff --git a/usr/src/lib/libdtrace_jni/common/dtj_consume.c b/usr/src/lib/libdtrace_jni/common/dtj_consume.c
index e656ff5ba5..3d43ab1c22 100644
--- a/usr/src/lib/libdtrace_jni/common/dtj_consume.c
+++ b/usr/src/lib/libdtrace_jni/common/dtj_consume.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -1784,6 +1784,7 @@ dtj_agghandler(const dtrace_bufdata_t *bufdata, dtj_java_consumer_t *jc)
 		if (jc->dtjj_tuple == NULL) {
 			(*jenv)->CallVoidMethod(jenv, jc->dtjj_probedata,
 			    g_pdatainvalidate_printa_jm);
+			goto printa_output;
 		}
 
 		tuple_member_count = (*jenv)->CallIntMethod(jenv,
@@ -1794,9 +1795,6 @@ dtj_agghandler(const dtrace_bufdata_t *bufdata, dtj_java_consumer_t *jc)
 			    g_pdatainvalidate_printa_jm);
 			(*jenv)->DeleteLocalRef(jenv, jc->dtjj_tuple);
 			jc->dtjj_tuple = NULL;
-		}
-
-		if (jc->dtjj_tuple == NULL) {
 			goto printa_output;
 		}
 
diff --git a/usr/src/lib/libdtrace_jni/common/dtrace_jni.c b/usr/src/lib/libdtrace_jni/common/dtrace_jni.c
index 4f68f6787e..3196f9d325 100644
--- a/usr/src/lib/libdtrace_jni/common/dtrace_jni.c
+++ b/usr/src/lib/libdtrace_jni/common/dtrace_jni.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -231,17 +231,15 @@ dtj_add_consumer(JNIEnv *jenv, dtj_consumer_t *c, int *seq)
 		bzero(g_consumer_table, (INITIAL_CAPACITY *
 		    sizeof (dtj_consumer_t *)));
 		g_consumer_capacity = INITIAL_CAPACITY;
+	} else if ((g_max_consumers > 0) && (g_consumer_count >=
+	    g_max_consumers)) {
+		dtj_throw_resource_limit(jenv, "Too many consumers");
+		(void) pthread_mutex_unlock(&g_table_lock);
+		return (B_FALSE);
 	} else if (g_consumer_count >= g_consumer_capacity) {
 		dtj_consumer_t **t;
 		size_t new_capacity;
 
-		if ((g_max_consumers > 0) && (g_consumer_count >=
-		    g_max_consumers)) {
-			dtj_throw_resource_limit(jenv, "Too many consumers");
-			(void) pthread_mutex_unlock(&g_table_lock);
-			return (B_FALSE);
-		}
-
 		if (g_consumer_capacity <= g_max_capacity_increment) {
 			new_capacity = (g_consumer_capacity * 2);
 		} else {
diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java
index f88532819a..1ec2035619 100644
--- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java
+++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/Aggregation.java
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * ident	"%Z%%M%	%I%	%E% SMI"
@@ -79,7 +79,7 @@ public final class Aggregation implements Serializable {
 	    BeanInfo info = Introspector.getBeanInfo(Aggregation.class);
 	    PersistenceDelegate persistenceDelegate =
 		    new DefaultPersistenceDelegate(
-		    new String[] {"name", "id", "records"})
+		    new String[] {"name", "ID", "records"})
 	    {
 		@Override
 		protected boolean
diff --git a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeDescription.java b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeDescription.java
index c0bfabcde8..cdd1631c4f 100644
--- a/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeDescription.java
+++ b/usr/src/lib/libdtrace_jni/java/src/org/opensolaris/os/dtrace/ProbeDescription.java
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * ident	"%Z%%M%	%I%	%E% SMI"
@@ -88,7 +88,7 @@ public final class ProbeDescription implements Serializable,
 	    BeanInfo info = Introspector.getBeanInfo(ProbeDescription.class);
 	    PersistenceDelegate persistenceDelegate =
 		    new DefaultPersistenceDelegate(
-		    new String[] {"id", "provider", "module",
+		    new String[] {"ID", "provider", "module",
 		    "function", "name"});
 	    BeanDescriptor d = info.getBeanDescriptor();
 	    d.setValue("persistenceDelegate", persistenceDelegate);