You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ch...@apache.org on 2006/04/05 14:49:17 UTC
svn commit: r391605 - in
/geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration:
SpringConfiguration.java SpringConfigurationServiceFactory.java
Author: chirino
Date: Wed Apr 5 05:49:16 2006
New Revision: 391605
URL: http://svn.apache.org/viewcvs?rev=391605&view=rev
Log:
Spring context was never being closed.
Modified:
geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfiguration.java
geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java
Modified: geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfiguration.java
URL: http://svn.apache.org/viewcvs/geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfiguration.java?rev=391605&r1=391604&r2=391605&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfiguration.java (original)
+++ geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfiguration.java Wed Apr 5 05:49:16 2006
@@ -47,7 +47,7 @@
* Creates a SpringConfiguration that registers and unregisters services that have been defined in a Spring ApplicationContext.
* @param applicationContext the application context from which services are registered
* @param kernel the kernel in which services are registered and unregistered
- * @throws Exception if a problem occurs while registering the services fromt he application context
+ * @throws Exception if a problem occurs while registering the services from the application context
*/
public SpringConfiguration(SpringApplicationContext applicationContext, Kernel kernel) throws Exception {
this.applicationContext = applicationContext;
Modified: geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java?rev=391605&r1=391604&r2=391605&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java (original)
+++ geronimo/xbean/trunk/xbean-server/src/main/java/org/apache/xbean/server/spring/configuration/SpringConfigurationServiceFactory.java Wed Apr 5 05:49:16 2006
@@ -83,7 +83,7 @@
* @return true
*/
public boolean isRestartable() {
- return true;
+ return false;
}
/**
@@ -127,6 +127,7 @@
springConfiguration.destroy();
springConfiguration = null;
}
+ applicationContext.close();
}
private static class ConfigurationStopCondition implements ServiceCondition {