Author: markt
Date: Thu Jan 15 05:31:05 2009
New Revision: 734700
URL: http://svn.apache.org/viewvc?rev=734700&view=rev
Log:
Code clean-up. Remove unnecessary ;'s id'd by Eclipse
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Jan 15
05:31:05 2009
@@ -480,7 +480,7 @@
inputStream = new FileInputStream(file);
inputSource = new InputSource("file://" + file.getAbsolutePath());
} catch (Exception e) {
- ;
+ // Ignore
}
if (inputStream == null) {
try {
@@ -490,7 +490,7 @@
(getClass().getClassLoader()
.getResource(getConfigFile()).toString());
} catch (Exception e) {
- ;
+ // Ignore
}
}
@@ -504,7 +504,7 @@
(getClass().getClassLoader()
.getResource("server-embed.xml").toString());
} catch (Exception e) {
- ;
+ // Ignore
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Thu Jan 15
05:31:05 2009
@@ -174,7 +174,7 @@
try {
input.close();
} catch (Throwable t) {
- ;
+ // Ignore
}
input = null;
}
@@ -182,7 +182,7 @@
try {
jarFile.close();
} catch (Throwable t) {
- ;
+ // Ignore
}
jarFile = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Thu
Jan 15 05:31:05 2009
@@ -182,7 +182,7 @@
try {
reader.close();
} catch (IOException f) {
- ;
+ // Ignore
}
reader = null;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Thu Jan 15
05:31:05 2009
@@ -626,7 +626,7 @@
}
}
} catch (NamingException e) {
- ; // Silent catch: it's valid that no /WEB-INF directory exists
+ // Silent catch: it's valid that no /WEB-INF directory exists
}
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Thu Jan
15 05:31:05 2009
@@ -117,7 +117,7 @@
try {
response.reset();
} catch (IllegalStateException e) {
- ;
+ // Ignore
}
response.sendError
@@ -130,7 +130,7 @@
try {
report(request, response, throwable);
} catch (Throwable tt) {
- ;
+ // Ignore
}
}
@@ -167,7 +167,7 @@
try {
report = sm.getString("http." + statusCode, message);
} catch (Throwable t) {
- ;
+ // Ignore
}
if (report == null)
return;
@@ -254,9 +254,9 @@
writer.write(sb.toString());
}
} catch (IOException e) {
- ;
+ // Ignore
} catch (IllegalStateException e) {
- ;
+ // Ignore
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jan 15
05:31:05 2009
@@ -1153,7 +1153,7 @@
new String(buffer, start, len) + ")");
}
- ; // No processing required
+ // No processing required
}
@@ -1173,7 +1173,7 @@
saxLog.debug("processingInstruction('" + target + "','" + data +
"')");
}
- ; // No processing is required
+ // No processing is required
}
@@ -1218,7 +1218,7 @@
saxLog.debug("skippedEntity(" + name + ")");
}
- ; // No processing required
+ // No processing required
}
@@ -2590,7 +2590,7 @@
protected void initialize() {
// Perform lazy initialization as needed
- ; // Nothing required by default
+ // Nothing required by default
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java Thu Jan 15
05:31:05 2009
@@ -113,9 +113,7 @@
* parameters instead.
*/
public void begin(Attributes attributes) throws Exception {
-
- ; // The default implementation does nothing
-
+ // The default implementation does nothing
}
@@ -153,9 +151,7 @@
* instead.
*/
public void body(String text) throws Exception {
-
- ; // The default implementation does nothing
-
+ // The default implementation does nothing
}
@@ -190,9 +186,7 @@
* <code>namespace</code> and <code>name</code> parameters instead.
*/
public void end() throws Exception {
-
- ; // The default implementation does nothing
-
+ // The default implementation does nothing
}
@@ -223,9 +217,7 @@
* called, to allow Rules to remove temporary data.
*/
public void finish() throws Exception {
-
- ; // The default implementation does nothing
-
+ // The default implementation does nothing
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java Thu Jan 15
05:31:05 2009
@@ -370,7 +370,7 @@
pos = nameEnd = getTokenEndPosition(bytes,pos,end);
// Skip whitespace
- while (pos < end && isWhiteSpace(bytes[pos])) {pos++; };
+ while (pos < end && isWhiteSpace(bytes[pos])) {pos++; }
// Check for an '=' -- This could also be a name-only
@@ -390,7 +390,7 @@
// Determine what type of value this is, quoted value,
// token, name-only with an '=', or other (bad)
switch (bytes[pos]) {
- case '"':; // Quoted Value
+ case '"': // Quoted Value
isQuoted = true;
valueStart=pos + 1; // strip "
// getQuotedValue returns the position before
@@ -413,7 +413,7 @@
valueStart = valueEnd = -1;
// The position is OK (On a delimiter)
break;
- default:;
+ default:
if (!isSeparator(bytes[pos])) {
// Token
valueStart=pos;
@@ -429,7 +429,7 @@
log("Invalid cookie. Value not a token or quoted
value");
while (pos < end && bytes[pos] != ';' &&
bytes[pos] != ',')
- {pos++; };
+ {pos++; }
pos++;
// Make sure no special avpairs can be attributed to
// the previous cookie by setting the current cookie
@@ -450,7 +450,7 @@
// in a good state.
// Skip whitespace
- while (pos < end && isWhiteSpace(bytes[pos])) {pos++; };
+ while (pos < end && isWhiteSpace(bytes[pos])) {pos++; }
// Make sure that after the cookie we have a separator. This
@@ -557,7 +557,7 @@
*/
public static final int getTokenEndPosition(byte bytes[], int off, int
end){
int pos = off;
- while (pos < end && !isSeparator(bytes[pos])) {pos++; };
+ while (pos < end && !isSeparator(bytes[pos])) {pos++; }
if (pos > end)
return end;
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Thu
Jan 15 05:31:05 2009
@@ -190,7 +190,7 @@
try {
date = formats[i].parse(value);
} catch (ParseException e) {
- ;
+ // Ignore
}
}
if (date == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Thu
Jan 15 05:31:05 2009
@@ -231,8 +231,8 @@
try {
response.add(new Attribute(names[i],getAttribute(names[i])));
} catch (Exception e) {
- ; // Not having a particular attribute in the response
- ; // is the indication of a getter problem
+ // Not having a particular attribute in the response
+ // is the indication of a getter problem
}
}
return (response);
@@ -474,7 +474,7 @@
try {
setAttribute(item);
} catch (Exception e) {
- ; // Ignore all exceptions
+ // Ignore all exceptions
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Thu Jan
15 05:31:05 2009
@@ -501,7 +501,7 @@
object = mbean;
m = object.getClass().getMethod(getMethod, NO_ARGS_PARAM_SIG);
} catch (NoSuchMethodException e) {
- exception = e;;
+ exception = e;
}
if( m== null && resource != null ) {
try {
@@ -548,7 +548,7 @@
object = bean;
m = object.getClass().getMethod(setMethod, signature);
} catch (NoSuchMethodException e) {
- exception = e;;
+ exception = e;
}
if( m== null && resource != null ) {
try {
@@ -608,7 +608,6 @@
method = object.getClass().getMethod(aname, types);
} catch (NoSuchMethodException e) {
exception = e;
- ;
}
try {
if ((method == null) && (resource != null)) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
Thu Jan 15 05:31:05 2009
@@ -63,7 +63,7 @@
public void handshake(Socket sock)
throws IOException {
- ; // NOOP
+ // NOOP
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=734700&r1=734699&r2=734700&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Thu
Jan 15 05:31:05 2009
@@ -341,7 +341,7 @@
KeyAttachment attachment =
(KeyAttachment)sk.attachment();
try {
attachment.access();
- iterator.remove(); ;
+ iterator.remove();
sk.interestOps(sk.interestOps() &
(~sk.readyOps()));
if ( sk.isReadable() ) {
countDown(attachment.getReadLatch());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
