Author: markt
Date: Fri Nov 4 09:55:27 2016
New Revision: 1767998
URL: http://svn.apache.org/viewvc?rev=1767998&view=rev
Log:
Fix DAEMON-333
Remove calls to explicit GC.
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1767998&r1=1767997&r2=1767998&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Fri Nov 4 09:55:27 2016
@@ -49,6 +49,10 @@
Compile the Windows binaries with the /DYNAMICBASE and /NXCOMPAT
switches.
</action>
+ <action issue="DAEMON-333" type="fix" dev="markt">
+ Remove calls to explicit garbage collection during daemon start and
+ stop.
+ </action>
</release>
</body>
</document>
Modified:
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java?rev=1767998&r1=1767997&r2=1767998&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
(original)
+++
commons/proper/daemon/trunk/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
Fri Nov 4 09:55:27 2016
@@ -117,9 +117,6 @@ public final class DaemonLoader
public static boolean load(String className, String args[])
{
try {
- /* Make sure any previous instance is garbage collected */
- System.gc();
-
/* Check if the underlying library supplied a valid list of
arguments */
if (args == null) {
@@ -271,10 +268,6 @@ public final class DaemonLoader
/* Attempt to stop the daemon */
Object arg[] = null;
stop.invoke(daemon, arg);
-
- /* Run garbage collector */
- System.gc();
-
}
catch (Throwable t) {
/* In case we encounter ANY error, we dump the stack trace and
@@ -293,11 +286,8 @@ public final class DaemonLoader
Object arg[] = null;
destroy.invoke(daemon, arg);
- /* Run garbage collector */
daemon = null;
controller = null;
- System.gc();
-
} catch (Throwable t) {
/* In case we encounter ANY error, we dump the stack trace and
* return false (load, start and stop won't be called).