Author: markt
Date: Thu Jan 14 08:40:32 2016
New Revision: 1724556
URL: http://svn.apache.org/viewvc?rev=1724556&view=rev
Log:
Fix import order (review by kolinko)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1724556&r1=1724555&r2=1724556&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Thu Jan 14 08:40:32 2016
@@ -5,17 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.core;
@@ -37,9 +35,9 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Manager;
import org.apache.catalina.util.Enumerator;
+import org.apache.catalina.util.StringManager;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.Parameters;
-import org.apache.catalina.util.StringManager;
/**
@@ -71,8 +69,8 @@ class ApplicationHttpRequest extends Htt
protected static final String specials[] =
{ Globals.INCLUDE_REQUEST_URI_ATTR, Globals.INCLUDE_CONTEXT_PATH_ATTR,
Globals.INCLUDE_SERVLET_PATH_ATTR, Globals.INCLUDE_PATH_INFO_ATTR,
- Globals.INCLUDE_QUERY_STRING_ATTR, Globals.FORWARD_REQUEST_URI_ATTR,
- Globals.FORWARD_CONTEXT_PATH_ATTR, Globals.FORWARD_SERVLET_PATH_ATTR,
+ Globals.INCLUDE_QUERY_STRING_ATTR, Globals.FORWARD_REQUEST_URI_ATTR,
+ Globals.FORWARD_CONTEXT_PATH_ATTR, Globals.FORWARD_SERVLET_PATH_ATTR,
Globals.FORWARD_PATH_INFO_ATTR, Globals.FORWARD_QUERY_STRING_ATTR };
@@ -214,7 +212,7 @@ class ApplicationHttpRequest extends Htt
if ( requestDispatcherPath != null ){
return requestDispatcherPath.toString();
} else {
- return null;
+ return null;
}
}
@@ -222,10 +220,10 @@ class ApplicationHttpRequest extends Htt
if (pos == -1) {
return getRequest().getAttribute(name);
} else {
- if ((specialAttributes[pos] == null)
+ if ((specialAttributes[pos] == null)
&& (specialAttributes[5] == null) && (pos >= 5)) {
// If it's a forward special attribute, and null, it means this
- // is an include, so we check the wrapped request since
+ // is an include, so we check the wrapped request since
// the request could have been forwarded before the include
return getRequest().getAttribute(name);
} else {
@@ -301,7 +299,7 @@ class ApplicationHttpRequest extends Htt
return (context.getServletContext().getRequestDispatcher(path));
// Convert a request-relative path to a context-relative one
- String servletPath =
+ String servletPath =
(String) getAttribute(Globals.INCLUDE_SERVLET_PATH_ATTR);
if (servletPath == null)
servletPath = getServletPath();
@@ -504,7 +502,7 @@ class ApplicationHttpRequest extends Htt
public HttpSession getSession(boolean create) {
if (crossContext) {
-
+
// There cannot be a session if no context has been assigned yet
if (context == null)
return (null);
@@ -517,7 +515,7 @@ class ApplicationHttpRequest extends Htt
HttpSession other = super.getSession(false);
if (create && (other == null)) {
// First create a session in the first context: the problem is
- // that the top level request is the only one which can
+ // that the top level request is the only one which can
// create the cookie safely
other = super.getSession(true);
}
@@ -533,7 +531,7 @@ class ApplicationHttpRequest extends Htt
// Ignore
}
if (localSession == null && create) {
- localSession =
+ localSession =
context.getManager().createSession(other.getId());
}
if (localSession != null) {
@@ -678,7 +676,7 @@ class ApplicationHttpRequest extends Htt
// Initialize the attributes for this request
dispatcherType = request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
- requestDispatcherPath =
+ requestDispatcherPath =
request.getAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR);
// Initialize the path elements for this request
@@ -768,7 +766,7 @@ class ApplicationHttpRequest extends Htt
/**
* Get a special attribute.
*
- * @return the special attribute pos, or -1 if it is not a special
+ * @return the special attribute pos, or -1 if it is not a special
* attribute
*/
protected int getSpecial(String name) {
@@ -783,7 +781,7 @@ class ApplicationHttpRequest extends Htt
/**
* Set a special attribute.
- *
+ *
* @return true if the attribute was a special attribute, false otherwise
*/
protected boolean setSpecial(String name, Object value) {
@@ -799,7 +797,7 @@ class ApplicationHttpRequest extends Htt
/**
* Remove a special attribute.
- *
+ *
* @return true if the attribute was a special attribute, false otherwise
*/
protected boolean removeSpecial(String name) {
@@ -919,7 +917,7 @@ class ApplicationHttpRequest extends Htt
}
public boolean hasMoreElements() {
- return ((pos != last) || (next != null)
+ return ((pos != last) || (next != null)
|| ((next = findNext()) != null));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
