3 files changed, 22 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/CombinedRequest.java b/server/src/com/vaadin/server/CombinedRequest.java
index 0a7da84049..b3569a249c 100644
--- a/server/src/com/vaadin/server/CombinedRequest.java
+++ b/server/src/com/vaadin/server/CombinedRequest.java
@@ -186,4 +186,9 @@ public class CombinedRequest implements VaadinRequest {
     public VaadinService getVaadinService() {
         return secondRequest.getVaadinService();
     }
+
+    @Override
+    public String getContextPath() {
+        return secondRequest.getContextPath();
+    }
 }
diff --git a/server/src/com/vaadin/server/VaadinPortletRequest.java b/server/src/com/vaadin/server/VaadinPortletRequest.java
index b0a16d01a4..c1bca824ef 100644
--- a/server/src/com/vaadin/server/VaadinPortletRequest.java
+++ b/server/src/com/vaadin/server/VaadinPortletRequest.java
@@ -225,4 +225,9 @@ public class VaadinPortletRequest implements VaadinRequest {
         }
         return (VaadinPortletRequest) request;
     }
+
+    @Override
+    public String getContextPath() {
+        return request.getContextPath();
+    }
 }
diff --git a/server/src/com/vaadin/server/VaadinRequest.java b/server/src/com/vaadin/server/VaadinRequest.java
index 0664d53f65..e48b9ede84 100644
--- a/server/src/com/vaadin/server/VaadinRequest.java
+++ b/server/src/com/vaadin/server/VaadinRequest.java
@@ -161,6 +161,18 @@ public interface VaadinRequest extends Serializable {
     public String getRequestPathInfo();
 
     /**
+     * Returns the portion of the request URI that indicates the context of the
+     * request. The context path always comes first in a request URI.
+     * 
+     * @see HttpServletRequest#getContextPath()
+     * @see PortletRequest#getContextPath()
+     * 
+     * @return a String specifying the portion of the request URI that indicates
+     *         the context of the request
+     */
+    public String getContextPath();
+
+    /**
      * Gets the session associated with this request, creating a new if there is
      * no session.
      *