[tomcat] 03/03: Fix IDE warnings

2020-05-04 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 02d11bb82e9b00bb9fe8f61eb42f3ca9cca40272
Author: Mark Thomas 
AuthorDate: Mon May 4 15:50:10 2020 +0100

Fix IDE warnings
---
 java/org/apache/juli/ClassLoaderLogManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index aca6388..a1cda43 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
 return null;
 }
 
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
 String result = null;
 
 // If a prefix is defined look for a prefixed property first
@@ -587,13 +587,13 @@ public class ClassLoaderLogManager extends LogManager {
 }
 }
 try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
 Handler handler = (Handler) classLoader.loadClass(
 handlerClassName).getConstructor().newInstance();
 // The specification strongly implies all configuration 
should be done
 // during the creation of the handler object.
 // This includes setting level, filter, formatter and 
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
 info.handlers.put(handlerName, handler);
 if (rootHandlers == null) {
 localRootLogger.addHandler(handler);


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

[tomcat] 03/03: Fix IDE warnings for missing @Deprecated annotations

2019-10-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ef5de17498316569ed490b0db1e60a7758b577a5
Author: Mark Thomas 
AuthorDate: Fri Oct 25 13:15:18 2019 +0200

Fix IDE warnings for missing @Deprecated annotations
---
 test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java | 1 +
 test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java | 1 +
 test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java | 4 
 3 files changed, 6 insertions(+)

diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java 
b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
index 0c5a4dd..fba4681 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
@@ -115,6 +115,7 @@ public class TesterCallableStatement extends 
TesterPreparedStatement implements
 /**
  * @deprecated
  */
+@Deprecated
 @Override
 public BigDecimal getBigDecimal(int parameterIndex, int scale) throws 
SQLException {
 return null;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java 
b/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
index 8c6e083..30298b6 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
@@ -184,6 +184,7 @@ public class TesterPreparedStatement extends 
TesterStatement implements Prepared
 }
 
 /** @deprecated */
+@Deprecated
 @Override
 public void setUnicodeStream(int parameterIndex, java.io.InputStream x, 
int length) throws SQLException {
 checkOpen();
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java 
b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
index c1c4a28..f934b35 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
@@ -162,6 +162,7 @@ public class TesterResultSet implements ResultSet {
 }
 
 /** @deprecated */
+@Deprecated
 @Override
 public BigDecimal getBigDecimal(int columnIndex, int scale) throws 
SQLException {
 checkOpen();
@@ -199,6 +200,7 @@ public class TesterResultSet implements ResultSet {
 }
 
 /** @deprecated */
+@Deprecated
 @Override
 public java.io.InputStream getUnicodeStream(int columnIndex) throws 
SQLException {
 checkOpen();
@@ -260,6 +262,7 @@ public class TesterResultSet implements ResultSet {
 }
 
 /** @deprecated */
+@Deprecated
 @Override
 public BigDecimal getBigDecimal(String columnName, int scale) throws 
SQLException {
 checkOpen();
@@ -297,6 +300,7 @@ public class TesterResultSet implements ResultSet {
 }
 
 /** @deprecated */
+@Deprecated
 @Override
 public java.io.InputStream getUnicodeStream(String columnName) throws 
SQLException {
 checkOpen();


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