Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1631] provide new "EmsBean loadBean(String objectName)" method (part of fix for https://jira.jboss.org/jira/browse/JBMANCON-430)
|
From: <isp...@rh...> - 2008-09-26 05:01:51
|
<!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] [1631] provide new "EmsBean loadBean(String objectName)" method (part of fix for https://jira.jboss.org/jira/browse/JBMANCON-430)</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1631</dd> <dt>Author</dt> <dd>ispringer</dd> <dt>Date</dt> <dd>2008-09-26 00:01:40 -0500 (Fri, 26 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>provide new "EmsBean loadBean(String objectName)" method (part of fix for https://jira.jboss.org/jira/browse/JBMANCON-430)</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 (1630 => 1631)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java 2008-09-25 22:42:22 UTC (rev 1630) +++ rhq/trunk/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java 2008-09-26 05:01:40 UTC (rev 1631) </span><span class="lines">@@ -94,20 +94,24 @@ </span><span class="cx"> } protected void loadBean() { </span><span class="rem">- JMXComponent parentServer = this.resourceContext.getParentResourceComponent(); </span><span class="cx"> Configuration pluginConfig = this.resourceContext.getPluginConfiguration(); </span><span class="rem">- EmsConnection emsConnection = parentServer.getEmsConnection(); </span><span class="cx"> String objectName = pluginConfig.getSimple(OBJECT_NAME_PROP).getStringValue(); </span><span class="rem">- this.bean = emsConnection.getBean(objectName); - if (this.bean == null) { </span><span class="add">+ this.bean = loadBean(objectName); + } + + protected EmsBean loadBean(String objectName) { + EmsConnection emsConnection = getEmsConnection(); + EmsBean bean = emsConnection.getBean(objectName); + if (bean == null) { </span><span class="cx"> // In some cases, this resource component may have been discovered by some means other than querying its // parent's EMSConnection (e.g. ApplicationDiscoveryComponent uses a filesystem to discover EARs and // WARs that are not yet deployed). In such cases, getBean() will return null, since EMS won't have the // bean in its cache. To cover such cases, make an attempt to query the underlying MBeanServer for the // bean before giving up. emsConnection.queryBeans(objectName); </span><span class="rem">- this.bean = emsConnection.getBean(objectName); </span><span class="add">+ bean = emsConnection.getBean(objectName); </span><span class="cx"> } </span><span class="add">+ return bean; </span><span class="cx"> } /** </span> </pre> </div> </div> </body> </html> |