From: <do...@hy...> - 2007-03-31 16:52:01
|
Author: dougm Date: 2007-03-31 08:51:57 -0800 (Sat, 31 Mar 2007) New Revision: 3991 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3991 Modified: trunk/src/org/hyperic/hq/product/DaemonDetector.java Log: apply installpath type version filters Modified: trunk/src/org/hyperic/hq/product/DaemonDetector.java =================================================================== --- trunk/src/org/hyperic/hq/product/DaemonDetector.java 2007-03-31 16:41:38 UTC (rev 3990) +++ trunk/src/org/hyperic/hq/product/DaemonDetector.java 2007-03-31 16:51:57 UTC (rev 3991) @@ -163,16 +163,20 @@ //since they will all have the same default configuration List servers = new ArrayList(); List found = getFileResources(platformConfig); - if (found.size() != 0) { - servers.add(found.get(0)); - } - else { + ServerResource server = null; + + if (found.size() == 0) { found = getProcessResources(platformConfig); - if (found.size() != 0) { - servers.add(found.get(0)); - } } + if (found.size() != 0) { + server = (ServerResource)found.get(0); + + if (isInstallTypeVersion(server.getInstallPath())) { + servers.add(server); + } + } + return servers; } |