Author: kkolinko
Date: Mon Aug 27 20:38:05 2012
New Revision: 1377839

URL: http://svn.apache.org/viewvc?rev=1377839&view=rev
Log:
Followup to r1377688

Merged revision 1377831 from tomcat/trunk:
1. Do not reference inaccessible class in Javadoc
(With my setting of JRE="Execution environment JavaSE-1.6", Eclipse complained 
about this in red).
2. Perform boxing explicitly.

Updated mergeinfo as if 1377544, 1377689 have been merged from trunk.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1377544,1377689,1377831

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1377839&r1=1377838&r2=1377839&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
 Mon Aug 27 20:38:05 2012
@@ -220,7 +220,7 @@ public class JreMemoryLeakPreventionList
     
     /**
      * Sets the time that this listener will request for garbage-collection 
latency
-     * @see {@link sun.misc.GC#requestLatency(long)}
+     * @see {@code sun.misc.GC#requestLatency(long)}
      */
     private long gcDaemonPeriod = Long.MAX_VALUE - 1;
     public long getGcDaemonPeriod() {
@@ -308,7 +308,7 @@ public class JreMemoryLeakPreventionList
                         Method method = clazz.getDeclaredMethod(
                                 "requestLatency",
                                 new Class[] {long.class});
-                        method.invoke(null, getGcDaemonPeriod());
+                        method.invoke(null, Long.valueOf(getGcDaemonPeriod()));
                     } catch (ClassNotFoundException e) {
                         if (System.getProperty("java.vendor").startsWith(
                                 "Sun")) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to