# HG changeset patch
# User kamg
# Date 1329282571 18000
# Node ID 90a6b021fb0ca5b104b93aad5889aee680273fe4
# Parent  a3473efef8a29c0cc095d0167ba38fcb7ab01d3e# Parent  1f4d0b5be982ed2f5480b217f04cdeeec53e1122
Merge

diff -r a3473efef8a2 -r 90a6b021fb0c hotspot/src/share/vm/runtime/dtraceJSDT.cpp
--- a/hotspot/src/share/vm/runtime/dtraceJSDT.cpp	Tue Feb 14 18:35:19 2012 -0500
+++ b/hotspot/src/share/vm/runtime/dtraceJSDT.cpp	Wed Feb 15 00:09:31 2012 -0500
@@ -82,7 +82,7 @@
 
   int handle = pd_activate((void*)probes,
     module_name, providers_count, providers);
-  if (handle <= 0) {
+  if (handle < 0) {
     delete probes;
     THROW_MSG_0(vmSymbols::java_lang_RuntimeException(),
       "Unable to register DTrace probes (internal error).");