|
From: <hr...@rh...> - 2009-01-30 10:50:11
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2844] If the emsBean is null, throw an exception with an explanation instead of a NPE later on.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2844</dd> <dt>Author</dt> <dd>hrupp</dd> <dt>Date</dt> <dd>2009-01-30 04:50:08 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>If the emsBean is null, throw an exception with an explanation instead of a NPE later on.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulespluginsjmxsrcmainjavaorgrhqpluginsjmxMBeanResourceComponentjava">rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulespluginsjmxsrcmainjavaorgrhqpluginsjmxMBeanResourceComponentjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java (2843 => 2844)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java 2009-01-30 10:05:29 UTC (rev 2843) +++ rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java 2009-01-30 10:50:08 UTC (rev 2844) </span><span class="lines">@@ -100,7 +100,7 @@ </span><span class="cx"> protected void loadBean() { Configuration pluginConfig = this.resourceContext.getPluginConfiguration(); String objectName = pluginConfig.getSimple(OBJECT_NAME_PROP).getStringValue(); </span><span class="rem">- this.bean = loadBean(objectName); </span><span class="add">+ this.bean = loadBean(objectName); </span><span class="cx"> } protected EmsBean loadBean(String objectName) { </span><span class="lines">@@ -422,6 +422,10 @@ </span><span class="cx"> public OperationResult invokeOperation(String name, Configuration parameters, EmsBean emsBean) throws Exception { </span><span class="add">+ if (emsBean==null) { + throw new Exception("Can not invoke operation [" + name + "], as we can't connect to the bean - is it down?"); + } + </span><span class="cx"> EmsOperation operation = emsBean.getOperation(name); if (operation == null) { throw new Exception("Operation [" + name + "] not found on bean [" + bean.getBeanName() + "]"); </span> </pre> </div> </div> </body> </html> |