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 2019/02/28 11:32:06 UTC
[tomcat] branch master updated (7a1a304 -> 9e052de)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 7a1a304 Finializer should be protected
new cd1e1eb Finializer should be protected
new 9e052de Remove unnecessary null check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/startup/Catalina.java | 10 +++-------
java/org/apache/tomcat/util/net/NioBlockingSelector.java | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Finializer should be protected
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cd1e1ebef3907a3f8eaf778ea5ae3a9d9f6b6bdf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 28 11:29:36 2019 +0000
Finializer should be protected
---
java/org/apache/tomcat/util/net/NioBlockingSelector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
index 62462e9..322b172 100644
--- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
+++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
@@ -471,7 +471,7 @@ public class NioBlockingSelector {
SelectionKey key = null;
@Override
- public void finalize() {
+ protected void finalize() {
if (key!=null && key.isValid()) {
log.warn(sm.getString("nioBlockingSelector.possibleLeak"));
try {key.cancel();}catch (Exception ignore){}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Remove unnecessary null check
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9e052debfe53cbc30cf6bec48670d3c1db848817
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 28 11:31:37 2019 +0000
Remove unnecessary null check
---
java/org/apache/catalina/startup/Catalina.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index d89bdba..f6b1446 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -566,13 +566,9 @@ public class Catalina {
digester.push(this);
digester.parse(inputSource);
} catch (Exception e) {
- if (file == null) {
- log.warn(sm.getString("catalina.configFail", getConfigFile() + "] or [server-embed.xml"), e);
- } else {
- log.warn(sm.getString("catalina.configFail", file.getAbsolutePath()), e);
- if (file.exists() && !file.canRead()) {
- log.warn(sm.getString("catalina.incorrectPermissions"));
- }
+ log.warn(sm.getString("catalina.configFail", file.getAbsolutePath()), e);
+ if (file.exists() && !file.canRead()) {
+ log.warn(sm.getString("catalina.incorrectPermissions"));
}
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org