Mercurial > hg > truffle

comparison src/share/vm/services/attachListener.cpp @ 20804:7848fc12602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 52b4284cb496 2545e461115b
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
160 DCmd::parse_and_execute(DCmd_Source_AttachAPI, out, op->arg(0), ' ', THREAD); 160 DCmd::parse_and_execute(DCmd_Source_AttachAPI, out, op->arg(0), ' ', THREAD);
161 if (HAS_PENDING_EXCEPTION) { 161 if (HAS_PENDING_EXCEPTION) {
162 java_lang_Throwable::print(PENDING_EXCEPTION, out); 162 java_lang_Throwable::print(PENDING_EXCEPTION, out);
163 out->cr(); 163 out->cr();
164 CLEAR_PENDING_EXCEPTION; 164 CLEAR_PENDING_EXCEPTION;
165 // The exception has been printed on the output stream 165 return JNI_ERR;
166 // If the JVM returns JNI_ERR, the attachAPI throws a generic I/O
167 // exception and the content of the output stream is not processed.
168 // By returning JNI_OK, the exception will be displayed on the client side
169 } 166 }
170 return JNI_OK; 167 return JNI_OK;
171 } 168 }
172 169
173 // Implementation of "dumpheap" command. 170 // Implementation of "dumpheap" command.