You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/11/06 14:59:32 UTC
svn commit: r1406140 - in /tomcat/trunk: java/org/apache/jasper/compiler/
java/org/apache/jasper/resources/
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
Author: markt
Date: Tue Nov 6 13:59:31 2012
New Revision: 1406140
URL: http://svn.apache.org/viewvc?rev=1406140&view=rev
Log:
Fix a handful of Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Tue Nov 6 13:59:31 2012
@@ -226,13 +226,13 @@ public class SmapUtil {
}
static byte[] readWhole(File input) throws IOException {
- FileInputStream inStream = new FileInputStream(input);
int len = (int)input.length();
byte[] bytes = new byte[len];
- if (inStream.read(bytes, 0, len) != len) {
- throw new IOException("expected size: " + len);
+ try (FileInputStream inStream = new FileInputStream(input)) {
+ if (inStream.read(bytes, 0, len) != len) {
+ throw new IOException("expected size: " + len);
+ }
}
- inStream.close();
return bytes;
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Tue Nov 6 13:59:31 2012
@@ -470,7 +470,10 @@ class TagLibraryInfoImpl extends TagLibr
}
}
- if (path.startsWith("/META-INF/tags")) {
+ if (path == null) {
+ // path is required
+ err.jspError("jsp.error.tagfile.missingPath");
+ } else if (path.startsWith("/META-INF/tags")) {
// Tag file packaged in JAR
// See https://issues.apache.org/bugzilla/show_bug.cgi?id=46471
// This needs to be removed once all the broken code that depends on
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue Nov 6 13:59:31 2012
@@ -326,6 +326,7 @@ jsp.error.jspoutput.invalidUse=<jsp:o
jsp.error.attributes.not.allowed = {0} must not have any attributes
jsp.error.tagfile.badSuffix=Missing \".tag\" suffix in tag file path {0}
jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with \"/WEB-INF/tags\" or \"/META-INF/tags\"
+jsp.error.tagfile.missingPath=Path not specified to tag file
jsp.error.plugin.wrongRootElement=Name of root element in {0} different from {1}
jsp.error.attribute.invalidPrefix=The attribute prefix {0} does not correspond to any imported tag library
jsp.error.nested.jspattribute=A jsp:attribute standard action cannot be nested within another jsp:attribute standard action
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Tue Nov 6 13:59:31 2012
@@ -183,6 +183,8 @@ public class DataSourceProxy implements
/**
* {@link javax.sql.DataSource#getConnection()}
+ * @param username unused
+ * @param password unused
*/
public javax.sql.PooledConnection getPooledConnection(String username,
String password) throws SQLException {
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java Tue Nov 6 13:59:31 2012
@@ -55,7 +55,8 @@ public class ProxyConnection extends Jdb
this.pool = pool;
}
- protected ProxyConnection(ConnectionPool parent, PooledConnection con, boolean useEquals) throws SQLException {
+ protected ProxyConnection(ConnectionPool parent, PooledConnection con,
+ boolean useEquals) {
pool = parent;
connection = con;
setUseEquals(useEquals);
@@ -67,7 +68,7 @@ public class ProxyConnection extends Jdb
this.connection = con;
}
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ public boolean isWrapperFor(Class<?> iface) {
if (iface == XAConnection.class && connection.getXAConnection()!=null) {
return true;
} else {
Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java?rev=1406140&r1=1406139&r2=1406140&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java Tue Nov 6 13:59:31 2012
@@ -115,11 +115,14 @@ public class TestStatementCache extends
Connection con1 = datasource.getConnection();
Connection con2 = datasource.getConnection();
for (int i=0; i<120; i++) {
+ @SuppressWarnings("resource") // Connections are closed below
Connection con = (i%2==0)?con1:con2;
PreparedStatement ps = con.prepareStatement("select "+i);
ps.close();
}
assertEquals(100,interceptor.getCacheSize().get());
+ con1.close();
+ con2.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org