Author: markt
Date: Sun Oct 12 10:39:51 2014
New Revision: 1631158
URL: http://svn.apache.org/r1631158
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57005
Fix javadoc errors when building with Java 8. Patch provided by Pierre Viret.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1631158&r1=1631157&r2=1631158&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Sun Oct 12 10:39:51 2014
@@ -583,7 +583,6 @@ public class DataSourceFactory implement
* <p>Parse properties from the string. Format of the string must be
[propertyName=property;]*<p>
* @param propText
* @return Properties
- * @throws Exception
*/
protected static Properties getProperties(String propText) {
return PoolProperties.getProperties(propText,null);
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java?rev=1631158&r1=1631157&r2=1631158&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
Sun Oct 12 10:39:51 2014
@@ -665,12 +665,12 @@ public interface PoolConfiguration {
/**
* Returns true if the pool sweeper is enabled for the connection pool.
* The pool sweeper is enabled if any settings that require async
intervention in the pool are turned on
- * <source>
- boolean result = getTimeBetweenEvictionRunsMillis()>0;
- result = result && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
- result = result || (isTestWhileIdle() && getValidationQuery()!=null);
+ * <code>
+ boolean result = getTimeBetweenEvictionRunsMillis()>0;
+ result = result && (isRemoveAbandoned() &&
getRemoveAbandonedTimeout()>0);
+ result = result || (isTestWhileIdle() &amp;&
getValidationQuery()!=null);
return result;
- </source>
+ </code>
*
* @return true if a background thread is or will be enabled for this pool
*/
@@ -698,7 +698,7 @@ public interface PoolConfiguration {
/**
* Time in milliseconds to keep this connection alive even when used.
* When a connection is returned to the pool, the pool will check to see
if the
- * ((now - time-when-connected) > maxAge) has been reached, and if so,
+ * ((now - time-when-connected) > maxAge) has been reached, and if so,
* it closes the connection rather than returning it to the pool.
* The default value is 0, which implies that connections will be left
open and no
* age check will be done upon returning the connection to the pool.
@@ -711,7 +711,7 @@ public interface PoolConfiguration {
/**
* Time in milliseconds to keep this connection alive even when used.
* When a connection is returned to the pool, the pool will check to see
if the
- * ((now - time-when-connected) > maxAge) has been reached, and if so,
+ * ((now - time-when-connected) > maxAge) has been reached, and if so,
* it closes the connection rather than returning it to the pool.
* The default value is 0, which implies that connections will be left
open and no
* age check will be done upon returning the connection to the pool.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1631158&r1=1631157&r2=1631158&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Sun Oct 12 10:39:51 2014
@@ -526,7 +526,7 @@ public class PooledConnection {
}
/**
- * This method is called if (Now - timeCheckedIn > getReleaseTime())
+ * This method is called if (Now - timeCheckedIn > getReleaseTime())
* This method disconnects the connection, logs an error in debug mode if
it happens
* then sets the {@link #released} flag to false. Any attempts to connect
this cached object again
* will fail per {@link #connect()}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631158&r1=1631157&r2=1631158&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Oct 12 10:39:51 2014
@@ -181,6 +181,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <fix>
+ <bug>57005</bug>: Fix javadoc errors when building with Java 8. Patch
+ provided by Pierre Viret. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
