Author: markt
Date: Wed Feb 20 11:48:02 2013
New Revision: 1448103
URL: http://svn.apache.org/r1448103
Log:
UCDetector
- use final
- reduce visibility
- remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/log/CaptureLog.java
tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/log/CaptureLog.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/CaptureLog.java?rev=1448103&r1=1448102&r2=1448103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/log/CaptureLog.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/CaptureLog.java Wed Feb 20
11:48:02 2013
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.log;
import java.io.ByteArrayOutputStream;
@@ -33,8 +32,8 @@ class CaptureLog {
ps = new PrintStream(baos);
}
- private ByteArrayOutputStream baos;
- private PrintStream ps;
+ private final ByteArrayOutputStream baos;
+ private final PrintStream ps;
protected PrintStream getStream() {
return ps;
Modified: tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java?rev=1448103&r1=1448102&r2=1448103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java Wed Feb
20 11:48:02 2013
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tomcat.util.log;
import java.io.IOException;
@@ -53,19 +52,19 @@ public class SystemLogHandler extends Pr
/**
* Wrapped PrintStream.
*/
- protected PrintStream out = null;
+ private final PrintStream out;
/**
* Thread <-> CaptureLog associations.
*/
- protected static ThreadLocal<Stack<CaptureLog>> logs = new ThreadLocal<>();
+ private final static ThreadLocal<Stack<CaptureLog>> logs = new
ThreadLocal<>();
/**
* Spare CaptureLog ready for reuse.
*/
- protected static Stack<CaptureLog> reuse = new Stack<>();
+ private final static Stack<CaptureLog> reuse = new Stack<>();
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java?rev=1448103&r1=1448102&r2=1448103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/UserDataHelper.java Wed Feb 20
11:48:02 2013
@@ -142,16 +142,8 @@ public class UserDataHelper {
* Log mode for the next log message.
*/
public static enum Mode {
- DEBUG(false), INFO_THEN_DEBUG(true), INFO(false);
-
- private final boolean fallToDebug;
-
- Mode(boolean fallToDebug) {
- this.fallToDebug = fallToDebug;
- }
-
- public boolean fallToDebug() {
- return fallToDebug;
- }
+ DEBUG,
+ INFO_THEN_DEBUG,
+ INFO;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
