2007-08-14 Marek Habersack <mhabersack@novell.com>
authorMarek Habersack <grendel@twistedcode.net>
Tue, 14 Aug 2007 10:52:59 +0000 (10:52 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 14 Aug 2007 10:52:59 +0000 (10:52 -0000)
* SessionStateServerHandler.cs: remove unused field.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* Control.cs: include the actual exception when reporting control
id clash.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* Roles.cs: remove unused field.

* SqlMembershipProvider.cs: remove unused variable.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* ObjectDataSourceView.cs: remove unused variable.

* ChangePassword.cs: remove unused variable.

* RoleGroupCollection.cs: OnValidate shouldn't be overridden.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* SqlProfileProvider.cs: remove unused variable.

2007-08-14  Marek Habersack  <mhabersack@novell.com>

* XmlSiteMapProvider.cs: do not hide this_lock.

svn path=/trunk/mcs/; revision=84041

20 files changed:
mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
mcs/class/System.Web/System.Web.Compilation/AssemblyBuilder.cs
mcs/class/System.Web/System.Web.Compilation/ChangeLog
mcs/class/System.Web/System.Web.Compilation/ClientBuildManager.cs
mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
mcs/class/System.Web/System.Web.Profile/ChangeLog
mcs/class/System.Web/System.Web.Profile/SqlProfileProvider.cs
mcs/class/System.Web/System.Web.Security/ChangeLog
mcs/class/System.Web/System.Web.Security/Roles.cs
mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs
mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog
mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
mcs/class/System.Web/System.Web.UI.WebControls/ChangePassword.cs
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
mcs/class/System.Web/System.Web.UI.WebControls/RoleGroupCollection.cs
mcs/class/System.Web/System.Web.UI/ChangeLog
mcs/class/System.Web/System.Web.UI/Control.cs
mcs/class/System.Web/System.Web/ChangeLog
mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs

index 4945a12dc6284e0cf5ae89c00edc926b1bb2e80f..5bc6697a3a1f43a871f8c0096258332c3f2e3eb6 100644 (file)
@@ -163,7 +163,7 @@ namespace System.Web.Compilation
                        
                        // First make sure all the files are in the same
                        // language
-                       bool known = false, unknown = false;
+                       bool known = false;
                        foreach (string f in files) {
                                known = true;
                                language = null;
@@ -228,7 +228,6 @@ namespace System.Web.Compilation
                                parameters.ReferencedAssemblies.AddRange (binAssemblies);
                        
                        if (compilationSection != null) {
-                               AssemblyName asmName;
                                foreach (AssemblyInfo ai in compilationSection.Assemblies)
                                        if (ai.Assembly != "*") {
                                                try {
@@ -248,7 +247,6 @@ namespace System.Web.Compilation
                                        if (bprovider == null)
                                                continue;
                                        bprovider.GenerateCode (abuilder);
-                                       unknown = true;
                                }
                        }
 
index 20451f82ccb1e6bd13f34faf6af5625649c3cfb6..fda3ffdeb015480997bcb93a37b569b87d9ffc99 100644 (file)
@@ -252,7 +252,7 @@ namespace System.Web.Compilation {
                                        results.CompiledAssembly = Assembly.LoadFrom (options.OutputAssembly);
                                } catch (Exception ex) {
                                        results.TempFiles.Delete ();
-                                       throw new HttpException ("Unable to load compiled assembly");
+                                       throw new HttpException ("Unable to load compiled assembly", ex);
                                }
                        }
 
index 9f7e2489e9e12980c45bbe6e4d1facc4ed57670f..c5eb874eb219202cfe6fe47d54bd68877179ca13 100644 (file)
@@ -1,5 +1,12 @@
 2007-08-14  Marek Habersack  <mhabersack@novell.com>
 
+       * TemplateControlCompiler.cs: remove dead code.
+
+       * AssemblyBuilder.cs: include actual exception information when
+       reporting inability to load a compiled assembly.
+
+       * AppCodeCompiler.cs: remove unused variables.
+
        * AspComponentFoundry.cs: use an ArrayList to implement LIFO for
        component collections, instead of the old Queue which implemented
        FIFO. Fixes situations when a control registered later for a
index fca6bd09e81319987e09de7b87d80c925bac364b..358a0c06a8c9cebe3de5bfbd9dd3a7b6417b41d9 100644 (file)
@@ -172,11 +172,10 @@ namespace System.Web.Compilation {
                        if (virtualPath == null || virtualPath == "")
                                throw new ArgumentNullException ("virtualPath");
 
-                       CodeCompileUnit unit = null;
                        Type cprovider_type;
                        CompilerParameters parameters;
-                       unit = GenerateCodeCompileUnit (virtualPath, virtualFileString, out cprovider_type,
-                                                       out parameters, out linePragmasTable);
+                       CodeCompileUnit unit = GenerateCodeCompileUnit (virtualPath, virtualFileString, out cprovider_type,
+                                                                       out parameters, out linePragmasTable);
                        return null;
                }
 
index fb417442b690a4e3e6da7aa1b772ec15cd3f4c97..3138c762856c6eb01d7c67c7f442e627aa6fd62c 100644 (file)
@@ -751,16 +751,10 @@ namespace System.Web.Compilation
                        if (obj == null)
                                return;
 
-                       Type member_type = null;
-                       if (isProperty)
-                               member_type = ((PropertyInfo)mi).PropertyType;
-                       else if (isField)
-                               member_type = ((FieldInfo)mi).FieldType;
-                       else
+                       if (!isProperty && !isField)
                                return; // an "impossible" case
                        
                        Type declaringType = mi.DeclaringType;
-                       TypeConverter converter = TypeDescriptor.GetProperties (declaringType) [memberName].Converter;
                        CodeAssignStatement assign = new CodeAssignStatement ();
                        
                        assign.Left = new CodePropertyReferenceExpression (ctrlVar, memberName);
index 050845303adb5a71abefabbea7c9de58f933687a..99d08d96ce0b81de73a77b405e4378d6fb6049f8 100644 (file)
@@ -1,3 +1,7 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * SqlProfileProvider.cs: remove unused variable.
+
 2007-07-16  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * ProfileBase.cs: fixed typo bug in InitProperties
index d88a6cacef6813732cc0962b1b4cdb7972ce5eed..b9b28ea70c10906ed1a21c96c0cfd8cffea4c512 100644 (file)
@@ -369,7 +369,6 @@ namespace System.Web.Profile
 
                        applicationName = GetStringConfigValue (config, "applicationName", "/");
 
-                       ProfileSection section = (ProfileSection) WebConfigurationManager.GetSection ("system.web/profile");
                        string connectionStringName = config ["connectionStringName"];
 
                        if (applicationName.Length > 256)
index faf9760511544610501e60eb12b7a0f5c2c61624..7363bfac3c7afbcb88b40bbfd85ab7cd674cc513 100644 (file)
@@ -1,3 +1,9 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * Roles.cs: remove unused field.
+
+       * SqlMembershipProvider.cs: remove unused variable.
+
 2007-08-13 Vladimir Krasnov <vladimirk@mainsoft.com>
 
        * SqlRoleProvider.cs: fixed ApplicationName initialization
index f4b674d3bfe6184f7fdbbb741976d97d36306ec8..9ccf8db5f11a098f08707ccb8ff825f528c5dbc8 100644 (file)
@@ -57,7 +57,6 @@ namespace System.Web.Security {
                        }
                }
 #else
-               private static CookieProtection cookie_protection;
                private static RoleManagerSection config;
                static RoleProviderCollection providersCollection;
 
index 8e96976faa7a70822599d44fd89b7284e14f31c3..3dfcf1a3ba4cc8bc50f645dfd4efe75792ccc8d3 100644 (file)
@@ -995,7 +995,7 @@ namespace System.Web.Security {
                                AddParameter (command, "@UpdateLastLoginActivityDate", false);
                                AddParameter (command, "@CurrentTimeUtc", DateTime.Now);
                                // return value
-                               DbParameter returnValue = AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null);
+                               AddParameter (command, "@ReturnVal", ParameterDirection.ReturnValue, DbType.Int32, null);
 
                                DbDataReader reader = command.ExecuteReader ();
                                if (!reader.Read ())
index 70662b0ff9a4ae7d6a92d6f89fa7944a9f5b13ae..fcbe62bb63360396133404cf329607e288f5ed4a 100644 (file)
@@ -1,3 +1,7 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * SessionStateServerHandler.cs: remove unused field.
+
 2007-07-31  Marek Habersack  <mhabersack@novell.com>
 
        * SessionInProcHandler.cs: initialize the static session objects
index 47c0ad3b079ae2da133da14f4a47f7c9b0f8ffde..b12a1cf8a086a62770671aa536bb23434f8afc95 100644 (file)
@@ -41,7 +41,6 @@ namespace System.Web.SessionState
                private const Int32 lockAcquireTimeout = 30000;
                
                SessionStateSection config;
-               NameValueCollection privateConfig;
                RemoteStateServer stateServer;
 
                public override SessionStateStoreData CreateNewStoreData (HttpContext context, int timeout)
@@ -161,7 +160,6 @@ namespace System.Web.SessionState
 #endif
                        if (String.IsNullOrEmpty (name))
                                name = "Session Server handler";
-                       privateConfig = config;
                        RemotingConfiguration.Configure (null);
                        string cons = null, proto = null, server = null, port = null;
                         GetConData (out proto, out server, out port);
index 362edf77079bd7fed08ecd00181a7bc0567d6f16..7ab26029bd20335aaa0d1dce27c8d9918e51edec 100644 (file)
@@ -1,3 +1,11 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * ObjectDataSourceView.cs: remove unused variable.
+
+       * ChangePassword.cs: remove unused variable.
+
+       * RoleGroupCollection.cs: OnValidate shouldn't be overridden.
+
 2007-08-14  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * ParameterCollection.cs: fixed IndexOfString, should use ordinal
index 2a7b47eae110a732cfa9662282f12bb0d8bbc962..03d515c56048ea9a337106b4f0743b0031b347fc 100644 (file)
@@ -1393,7 +1393,6 @@ namespace System.Web.UI.WebControls
                                FailureTextLiteral.ID = "FailureText";
                                FailureTextLiteral.EnableViewState = false;
 
-                               Style FailureTextStyle = new Style ();
                                if (_owner.FailureTextStyle.ForeColor.IsEmpty)
                                        _owner.FailureTextStyle.ForeColor = System.Drawing.Color.Red;
 
index 03629fb21c9ebf2aac33cc933c40a099b590df6b..f7810b6fcf3df6154331a20a81e1d3b25dc35c79 100644 (file)
@@ -1073,7 +1073,6 @@ namespace System.Web.UI.WebControls
 
                        outParamInfos = null;
                        object[] values = new object [methodParams.Length];
-                       object converted;
                        
                        foreach (ParameterInfo mp in methodParams) {
                        
index 879625d94a5eafd51dbd11652c6f5bc77cc9e632..6794f84b91c60f17a812a3a00fd0e69e3cd579f0 100644 (file)
@@ -106,10 +106,6 @@ namespace System.Web.UI.WebControls {
                                        ((IList) this).Remove (group);
                        }
                }
-
-               public void OnValidate (object sender)
-               {
-               }
        }
 }
 
index f9b04a38de65b72f37e54f41e42e1fc958cbc2a6..1aafc29c6c5b6696bc785b189befffcda967c0c3 100644 (file)
@@ -1,3 +1,8 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * Control.cs: include the actual exception when reporting control
+       id clash.
+
 2007-08-10  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * PageParser.cs: Replace enableSessionState and readOnlySessionState
index ffd390b83bfa594704206e41bd4a96d16959b7c0..2a0e0d3e9ef9c75943454cde83c568b126cb4a45 100644 (file)
@@ -811,7 +811,7 @@ namespace System.Web.UI
                                                _controlsCache.Add (c._userId, c);
                                }
                                catch (Exception ex) {
-                                       throw new HttpException ("Found more than one control with ID '" + c._userId + "'");
+                                       throw new HttpException ("Found more than one control with ID '" + c._userId + "'", ex);
                                }
 
                                if ((c.stateMask & IS_NAMING_CONTAINER) == 0 && c.HasControls ())
index 940fb49b2985d58198c4c1ae22d7405ab0435ea2..03ffd9ac1f7ba0994fc63bb3ebe3019c17e53e9e 100644 (file)
@@ -1,3 +1,7 @@
+2007-08-14  Marek Habersack  <mhabersack@novell.com>
+
+       * XmlSiteMapProvider.cs: do not hide this_lock.
+
 2007-08-09  Marek Habersack  <mhabersack@novell.com>
 
        * HttpApplicationFactory.cs: unconditionally watch for changes
index 6a16cdabcdc1f5774dec08f272e8e4e5cb765a0b..aa535b4ba64c5afbe37abbc21e40220b280a4dbe 100644 (file)
@@ -46,7 +46,6 @@ namespace System.Web
        {
                static readonly char [] seperators = { ';', ',' };
 
-               object this_lock = new object ();
                bool building;
                string file;
                SiteMapNode root = null;