You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/10/18 22:02:10 UTC
svn commit: r586107 - in /cayenne/main/trunk:
docs/doc/src/main/resources/RELEASE-NOTES.txt
framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
Author: aadamchik
Date: Thu Oct 18 13:02:09 2007
New Revision: 586107
URL: http://svn.apache.org/viewvc?rev=586107&view=rev
Log:
CAY-882 Configuration shutdown hook thread may lead to memory leaks
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=586107&r1=586106&r2=586107&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Thu Oct 18 13:02:09 2007
@@ -8,6 +8,18 @@
http://issues.apache.org/cayenne/
----------------------------------
+Release: 3.0M3
+Date:
+----------------------------------
+
+Changes/New Features Since M2:
+
+Bug fixes since M2:
+
+CAY-882 Configuration shutdown hook thread may lead to memory leaks
+
+
+----------------------------------
Release: 3.0M2
Date:
----------------------------------
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java?rev=586107&r1=586106&r2=586107&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java Thu Oct 18 13:02:09 2007
@@ -69,7 +69,7 @@
protected boolean ignoringLoadFailures;
protected ConfigLoaderDelegate loaderDelegate;
protected ConfigSaverDelegate saverDelegate;
- protected ConfigurationShutdownHook configurationShutdownHook = new ConfigurationShutdownHook();
+ protected ConfigurationShutdownHook configurationShutdownHook;
protected Map dataViewLocations = new HashMap();
protected String projectVersion;
@@ -463,10 +463,17 @@
public void installConfigurationShutdownHook() {
uninstallConfigurationShutdownHook();
+
+ if (configurationShutdownHook == null) {
+ configurationShutdownHook = new ConfigurationShutdownHook();
+ }
+
Runtime.getRuntime().addShutdownHook(configurationShutdownHook);
}
public void uninstallConfigurationShutdownHook() {
- Runtime.getRuntime().removeShutdownHook(configurationShutdownHook);
+ if (configurationShutdownHook != null) {
+ Runtime.getRuntime().removeShutdownHook(configurationShutdownHook);
+ }
}
}