From 9145ea30b91fb861f9b7c86d123547ee147e06b9 Mon Sep 17 00:00:00 2001 From: eeichinger Date: Wed, 4 Mar 2009 21:56:11 +0000 Subject: [PATCH] fixed net-1.0 build error --- src/Spring/Spring.Web/Web/Support/Result.cs | 14 +++++++++--- .../Spring.Web/Web/Support/ResultMode.cs | 22 ++++++++++--------- .../Web/Support/ResultTests.cs | 3 +++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/Spring/Spring.Web/Web/Support/Result.cs b/src/Spring/Spring.Web/Web/Support/Result.cs index 9e7c7571..558755da 100644 --- a/src/Spring/Spring.Web/Web/Support/Result.cs +++ b/src/Spring/Spring.Web/Web/Support/Result.cs @@ -234,13 +234,15 @@ namespace Spring.Web.Support get { return (Mode == ResultMode.Transfer); } } - /// - /// Indicates, if should be called with endResponse='true' | 'false'. Only relevant for ResultMode.RedirectXXXX modes. - /// +#if !NET_1_0 + /// + /// Indicates, if should be called with endResponse='true' | 'false'. Only relevant for ResultMode.RedirectXXXX modes. + /// public bool EndResponse { get { return (Mode == ResultMode.Redirect); } } +#endif #endregion @@ -257,7 +259,9 @@ namespace Spring.Web.Support switch (Mode) { case ResultMode.Redirect: +#if !NET_1_0 case ResultMode.RedirectNoAbort: +#endif DoRedirect( context ); break; case ResultMode.Transfer: @@ -321,7 +325,11 @@ namespace Spring.Web.Support /// protected virtual void DoRedirect( object context ) { +#if !NET_1_0 HttpContext.Current.Response.Redirect( GetRedirectUri( context ), EndResponse ); +#else + HttpContext.Current.Response.Redirect( GetRedirectUri( context ) ); +#endif } /// diff --git a/src/Spring/Spring.Web/Web/Support/ResultMode.cs b/src/Spring/Spring.Web/Web/Support/ResultMode.cs index e111a430..f4d089d4 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultMode.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultMode.cs @@ -70,17 +70,19 @@ namespace Spring.Web.Support /// TransferNoPreserve = 2, - /// - /// A redirect. - /// - /// - ///

- /// Issues a redirect (to the user-agent - typically a browser) using - /// the method. - ///

- ///
- /// +#if !NET_1_0 + /// + /// A redirect. + /// + /// + ///

+ /// Issues a redirect (to the user-agent - typically a browser) using + /// the method. + ///

+ ///
+ /// RedirectNoAbort = 3 +#endif } } diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs index c66a6b6a..96089ca9 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs @@ -148,6 +148,7 @@ namespace Spring.Web.Support "from the result string passed into the ctor."); } +#if !NET_1_0 [Test] public void WithRedirectNoAbortResultMode() { @@ -162,6 +163,8 @@ namespace Spring.Web.Support "from the result string passed into the ctor."); } +#endif + [Test] [ExpectedException(typeof(ArgumentOutOfRangeException))] public void WithRubbishResultMode()