From eff11c8992df78b18b07cc0137d27ea1e2d7eb47 Mon Sep 17 00:00:00 2001
From: Demis Bellot <demis.bellot@gmail.com>
Date: Mon, 15 Dec 2014 11:54:13 -0500
Subject: [PATCH] change all SSController methods to protected to avoid
 conflicts with route.MapMvcAttributeRoutes()

---
 src/ServiceStack.Mvc/ServiceStackController.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ServiceStack.Mvc/ServiceStackController.cs b/src/ServiceStack.Mvc/ServiceStackController.cs
index d93560165c6..9350ec1195c 100644
--- a/src/ServiceStack.Mvc/ServiceStackController.cs
+++ b/src/ServiceStack.Mvc/ServiceStackController.cs
@@ -104,7 +104,7 @@ protected override JsonResult Json(object data, string contentType, Encoding con
             };
         }
 
-        public virtual ActionResult InvokeDefaultAction(HttpContextBase httpContext)
+        protected virtual ActionResult InvokeDefaultAction(HttpContextBase httpContext)
         {
             try
             {
@@ -201,35 +201,35 @@ public virtual bool IsAuthenticated
         {
             get { return ServiceStackProvider.IsAuthenticated; }
         }
-        public virtual T TryResolve<T>()
+        protected virtual T TryResolve<T>()
         {
             return ServiceStackProvider.TryResolve<T>();
         }
-        public virtual T ResolveService<T>()
+        protected virtual T ResolveService<T>()
         {
             return ServiceStackProvider.ResolveService<T>();
         }
-        public virtual object Execute(object requestDto)
+        protected virtual object Execute(object requestDto)
         {
             return ServiceStackProvider.Execute(requestDto);
         }
-        public virtual object ForwardRequestToServiceStack(IRequest request = null)
+        protected virtual object ForwardRequestToServiceStack(IRequest request = null)
         {
             return ServiceStackProvider.Execute(request ?? ServiceStackProvider.Request);
         }
-        public virtual IAuthSession GetSession(bool reload = true)
+        protected virtual IAuthSession GetSession(bool reload = true)
         {
             return ServiceStackProvider.GetSession(reload);
         }
-        public virtual TUserSession SessionAs<TUserSession>()
+        protected virtual TUserSession SessionAs<TUserSession>()
         {
             return ServiceStackProvider.SessionAs<TUserSession>();
         }
-        public virtual void ClearSession()
+        protected virtual void ClearSession()
         {
             ServiceStackProvider.ClearSession();
         }
-        public virtual void PublishMessage<T>(T message)
+        protected virtual void PublishMessage<T>(T message)
         {
             ServiceStackProvider.PublishMessage(message);
         }