[Hyperic-hq-discuss] hq r7294 - trunk/src/org/hyperic/hq/appdef/server/session

[<rm...@hy...>]

Author: rmorgan
Date: 2007-12-18 11:21:24 -0800 (Tue, 18 Dec 2007)
New Revision: 7294
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7294

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java
Log:
Obey the original required flag when merging configurations.  In the case of a server with no config we
were returing the platform properites rather than throwing a ConfigFetchException.  The absense of this
exception would cause metrics to be enabled for resources that require a configuration, resulting in NPEs
on the agent.
[HHQ-1368]



Modified: trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java	2007-12-18 19:15:51 UTC (rev 7293)
+++ trunk/src/org/hyperic/hq/appdef/server/session/ConfigManagerEJBImpl.java	2007-12-18 19:21:24 UTC (rev 7294)
@@ -219,8 +219,8 @@
         int responseIdx;
         byte[] data;
         ServerConfigStuff server = null;
-        PlatformConfigStuff platform = null;
-        boolean origReq = false;
+        PlatformConfigStuff platform;
+        boolean origReq = required;
         boolean isServerOrService = false;
         boolean isProductType = productType.equals(ProductPlugin.TYPE_PRODUCT);