Attachment 833476 Details for Bug 1030452 – Possible patch

[patch] Possible patch

BZ_1030452_-_Cleanout_plugin_descriptors_after_parsing_.patch (text/plain), 2.88 KB, created by Heiko W. Rupp on 2013-12-06 09:03:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Heiko W. Rupp

Created: 2013-12-06 09:03:05 UTC

Size: 2.88 KB

patch

obsolete

>Index: modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>ISO-8859-1
>===================================================================
>--- modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java	(revision ec67bac995a335960f2d5d4a39070bc5d408f08b)
>+++ modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java	(revision )
>@@ -64,7 +64,7 @@
>     static {
>         TEST_PLATFORM_TYPE.setClassLoaderType(ClassLoaderType.SHARED);
>     }
>-    
>+
>     private Log log = LogFactory.getLog(PluginMetadataManager.class);
> 
>     private Map<ResourceCategory, LinkedHashSet<ResourceType>> typesByCategory = new HashMap<ResourceCategory, LinkedHashSet<ResourceType>>();
>@@ -295,7 +295,7 @@
> 
>     /**
>      * Builds the dependency graph using all known descriptors.
>-     * 
>+     *
>      * @return dependency graph
>      */
>     public PluginDependencyGraph buildDependencyGraph() {
>@@ -541,4 +541,11 @@
> 
>         return;
>     }
>+
>+    public void cleanupDescriptors() {
>+        descriptorsByPlugin.clear();
>+        for (PluginMetadataParser parser : parsersByPlugin.values()) {
>+            parser.cleanDescriptor();
>+        }
>+    }
> }
>Index: modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>ISO-8859-1
>===================================================================
>--- modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java	(revision ec67bac995a335960f2d5d4a39070bc5d408f08b)
>+++ modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java	(revision )
>@@ -172,6 +172,7 @@
>                 }
>             }
>             log.info("Deployed plugins: " + this.loadedPlugins);
>+            metadataManager.cleanupDescriptors();
>         } catch (Exception e) {
>             shutdown(); // have to clean up the environments (e.g. unpacked jars) we might have already created
>             log.error("Error initializing plugin container", e);
>Index: modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>ISO-8859-1
>===================================================================
>--- modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java	(revision ec67bac995a335960f2d5d4a39070bc5d408f08b)
>+++ modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java	(revision )
>@@ -924,4 +924,7 @@
>         return null;
>     }
> 
>+    public void cleanDescriptor() {
>+        pluginDescriptor=null;
>+    }
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 1030452: 833476