Author: markt
Date: Wed Mar 21 10:10:48 2018
New Revision: 1827399
URL: http://svn.apache.org/viewvc?rev=1827399&view=rev
Log:
SpotBugs
Avoid catching Exception
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Mar 21 10:10:48 2018
@@ -1033,7 +1033,7 @@ public abstract class AbstractReplicated
entry.setCopy(false);
if ( getMapOwner()!=null )
getMapOwner().objectMadePrimary(key, entry.getValue());
- } catch (Exception x) {
+ } catch (RuntimeException | ChannelException |
ClassNotFoundException | IOException x) {
log.error(sm.getString("abstractReplicatedMap.unable.get"), x);
return null;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncParser.java Wed Mar 21
10:10:48 2018
@@ -228,7 +228,7 @@ class Http2AsyncParser extends Http2Pars
}
}
} while (continueParsing);
- } catch (Exception e) {
+ } catch (RuntimeException | IOException | Http2Exception e) {
error = e;
}
if (payload.hasRemaining()) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Mar 21
10:10:48 2018
@@ -268,7 +268,7 @@ public abstract class Compiler {
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
- } catch (Exception e) {
+ } catch (RuntimeException e) {
// Remove the generated .java file
File file = new File(javaFileName);
if (file.exists()) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Wed Mar
21 10:10:48 2018
@@ -20,6 +20,7 @@ package org.apache.jasper.compiler;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilePermission;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLClassLoader;
@@ -517,7 +518,7 @@ public final class JspRuntimeContext {
// Allow the JSP to access
org.apache.jasper.runtime.HttpJspBase
permissions.add( new RuntimePermission(
"accessClassInPackage.org.apache.jasper.runtime") );
- } catch(Exception e) {
+ } catch(RuntimeException | IOException e) {
context.log("Security Init for context failed",e);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Wed Mar
21 10:10:48 2018
@@ -601,7 +601,7 @@ class TagFileProcessor {
entry.getValue());
}
}
- } catch (Exception e) {
+ } catch (RuntimeException | ReflectiveOperationException
e) {
// ignore errors
}
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Wed Mar
21 10:10:48 2018
@@ -489,7 +489,7 @@ public class JspRuntimeLibrary {
}
method.invoke (bean, new Object[] {tmpval});
}
- } catch (Exception ex) {
+ } catch (RuntimeException | ReflectiveOperationException ex) {
Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
ExceptionUtils.handleThrowable(thr);
throw new JasperException ("error in invoking method", ex);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Wed Mar 21 10:10:48 2018
@@ -268,8 +268,7 @@ public class AsyncChannelWrapperSecure i
Future<Integer> f =
socketChannel.read(socketReadBuffer);
Integer socketRead = f.get();
if (socketRead.intValue() == -1) {
- throw new EOFException(sm.getString(
- "asyncChannelWrapperSecure.eof"));
+ throw new
EOFException(sm.getString("asyncChannelWrapperSecure.eof"));
}
}
@@ -277,8 +276,7 @@ public class AsyncChannelWrapperSecure i
if (socketReadBuffer.hasRemaining()) {
// Decrypt the data in the buffer
- SSLEngineResult r =
- sslEngine.unwrap(socketReadBuffer, dest);
+ SSLEngineResult r = sslEngine.unwrap(socketReadBuffer,
dest);
read += r.bytesProduced();
Status s = r.getStatus();
@@ -335,7 +333,8 @@ public class AsyncChannelWrapperSecure i
future.fail(new IllegalStateException(sm.getString(
"asyncChannelWrapperSecure.wrongStateRead")));
}
- } catch (Exception e) {
+ } catch (RuntimeException | ReadBufferOverflowException |
SSLException | EOFException |
+ ExecutionException | InterruptedException e) {
reading.set(false);
future.fail(e);
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Wed Mar 21 10:10:48 2018
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -293,7 +294,7 @@ public class StatementCache extends Stat
proxy.cached = true;
shouldClose = false;
}
- } catch (Exception x) {
+ } catch (RuntimeException | ReflectiveOperationException |
SQLException x) {
removeStatement(proxy);
}
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
Wed Mar 21 10:10:48 2018
@@ -17,7 +17,9 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.SQLException;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -259,7 +261,7 @@ public class ConnectCountTest extends De
totalruntime+=(System.nanoTime()-start);
}
- } catch (Exception x) {
+ } catch (RuntimeException | SQLException | ExecutionException |
InterruptedException x) {
x.printStackTrace();
} finally {
ConnectCountTest.this.latch.countDown();
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java?rev=1827399&r1=1827398&r2=1827399&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
Wed Mar 21 10:10:48 2018
@@ -17,7 +17,9 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
+import java.sql.SQLException;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -241,7 +243,7 @@ public class FairnessTest extends Defaul
totalruntime+=(System.nanoTime()-start);
}
- } catch (Exception x) {
+ } catch (RuntimeException | SQLException | ExecutionException |
InterruptedException x) {
x.printStackTrace();
} finally {
FairnessTest.this.latch.countDown();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
