You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/02/23 01:25:29 UTC

svn commit: r915120 - /geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java

Author: gawor
Date: Tue Feb 23 00:25:29 2010
New Revision: 915120

URL: http://svn.apache.org/viewvc?rev=915120&view=rev
Log:
only update geronimo-plugin.xml when there is a temporary bundle

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=915120&r1=915119&r2=915120&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java Tue Feb 23 00:25:29 2010
@@ -565,10 +565,12 @@
             environment.setBundleActivator(ConfigurationActivator.class.getName());
         }
 
-        try {
-            createPluginMetadata();
-        } catch (Exception e) {
-            throw new DeploymentException("Failed to update geronimo-plugin.xml", e);
+        if (tempBundle != null) {
+            try {
+                createPluginMetadata();
+            } catch (Exception e) {
+                throw new DeploymentException("Failed to update geronimo-plugin.xml", e);
+            }
         }
 
         ConfigurationData configurationData = new ConfigurationData(configuration.getModuleType(),