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 2009/12/30 10:29:20 UTC
svn commit: r894573 -
/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Author: markt
Date: Wed Dec 30 09:29:19 2009
New Revision: 894573
URL: http://svn.apache.org/viewvc?rev=894573&view=rev
Log:
Fix some Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=894573&r1=894572&r2=894573&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Wed Dec 30 09:29:19 2009
@@ -244,6 +244,8 @@
/* some vars below copied from Craig R. McClanahan's InvokerServlet */
+ private static final long serialVersionUID = 1L;
+
/** the debugging detail level for this servlet. */
private int debug = 0;
@@ -327,7 +329,9 @@
*
*/
protected void printServletEnvironment(ServletOutputStream out,
- HttpServletRequest req, HttpServletResponse res) throws IOException {
+ HttpServletRequest req,
+ @SuppressWarnings("unused") HttpServletResponse res)
+ throws IOException {
// Document the properties from ServletRequest
out.println("<h1>ServletRequest Properties</h1>");
@@ -867,21 +871,21 @@
}
if (!currentLocation.isFile()) {
return new String[] { null, null, null, null };
- } else {
- if (debug >= 2) {
- log("findCGI: FOUND cgi at " + currentLocation);
- }
- path = currentLocation.getAbsolutePath();
- name = currentLocation.getName();
+ }
- if (".".equals(contextPath)) {
- scriptname = servletPath;
- } else {
- scriptname = contextPath + servletPath;
- }
- if (!servletPath.equals(cginame)) {
- scriptname = scriptname + cginame;
- }
+ if (debug >= 2) {
+ log("findCGI: FOUND cgi at " + currentLocation);
+ }
+ path = currentLocation.getAbsolutePath();
+ name = currentLocation.getName();
+
+ if (".".equals(contextPath)) {
+ scriptname = servletPath;
+ } else {
+ scriptname = contextPath + servletPath;
+ }
+ if (!servletPath.equals(cginame)) {
+ scriptname = scriptname + cginame;
}
if (debug >= 1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org