Author: markt
Date: Mon Jun 17 19:57:41 2013
New Revision: 1493908
URL: http://svn.apache.org/r1493908
Log:
Fix indents
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1493740
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1493908&r1=1493907&r2=1493908&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Mon Jun 17 19:57:41 2013
@@ -556,26 +556,26 @@ public class TestFormAuthenticator exten
return fullPath;
}
- /*
- * extract the session id path element (if it exists in the given url)
- */
- private String extractPathSessionId(String url) {
- String sessionId = null;
- int iStart = url.indexOf(SESSION_PARAMETER_START);
- if (iStart > -1) {
- iStart += SESSION_PARAMETER_START.length();
- String remainder = url.substring(iStart);
- StringTokenizer parser =
- new StringTokenizer(remainder,
SESSION_PATH_PARAMETER_TAILS);
- if (parser.hasMoreElements()) {
- sessionId = parser.nextToken();
- }
- else {
- sessionId = url.substring(iStart);
+ /*
+ * extract the session id path element (if it exists in the given url)
+ */
+ private String extractPathSessionId(String url) {
+ String sessionId = null;
+ int iStart = url.indexOf(SESSION_PARAMETER_START);
+ if (iStart > -1) {
+ iStart += SESSION_PARAMETER_START.length();
+ String remainder = url.substring(iStart);
+ StringTokenizer parser = new StringTokenizer(remainder,
+ SESSION_PATH_PARAMETER_TAILS);
+ if (parser.hasMoreElements()) {
+ sessionId = parser.nextToken();
+ }
+ else {
+ sessionId = url.substring(iStart);
+ }
}
+ return sessionId;
}
- return sessionId;
- }
private void assertContains(String body, String expected) {
if (!body.contains(expected)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
