From 9b30bb4b5d6b3ffa9c8ab4c7e9507abff614c1d2 Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Mon, 6 Nov 2006 12:50:18 +0000
Subject: [PATCH] WW-1488 Update license headers (test commit).

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@471717 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/struts2/RequestUtils.java | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/RequestUtils.java b/core/src/main/java/org/apache/struts2/RequestUtils.java
index 70a959130..9c0574444 100644
--- a/core/src/main/java/org/apache/struts2/RequestUtils.java
+++ b/core/src/main/java/org/apache/struts2/RequestUtils.java
@@ -1,19 +1,22 @@
 /*
  * $Id$
  *
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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
  *
- * Licensed 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
  *
- *      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.
+ * 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.struts2;
 
@@ -28,26 +31,26 @@ public class RequestUtils {
     /**
      * Retrieves the current request servlet path.
      * Deals with differences between servlet specs (2.2 vs 2.3+)
-     * 
+     *
      * @param request the request
      * @return the servlet path
      */
     public static String getServletPath(HttpServletRequest request) {
         String servletPath = request.getServletPath();
-        
+
         if (null != servletPath && !"".equals(servletPath)) {
             return servletPath;
         }
-        
+
         String requestUri = request.getRequestURI();
         int startIndex = request.getContextPath().equals("") ? 0 : request.getContextPath().length();
         int endIndex = request.getPathInfo() == null ? requestUri.length() : requestUri.lastIndexOf(request.getPathInfo());
-        
+
         if (startIndex > endIndex) { // this should not happen
             endIndex = startIndex;
         }
-        
+
         return requestUri.substring(startIndex, endIndex);
     }
-    
+
 }