Zbiór zmian 1003 dla trunk/BazaReklam/Logowanie.cs

Data:

2010-01-14 17:07:10 (16 years ago)

Autor:

Sylwek

Opis:

Re #243 Blokada usuwania kontaktów z klientami

Pliki:

• trunk/BazaReklam/Logowanie.cs (zmodyfikowane) (6 diffs)

trunk/BazaReklam/Logowanie.cs

@@ -9 +9 @@
     public partial class Logowanie : Form
     {
-
-        #region Fields (2)
-
         private bool loginResult;
         private readonly SqlConnectionStringBuilder sqlBldr = new SqlConnectionStringBuilder();
 
-        #endregion Fields
-
-        #region Constructors (1)
-
         public Logowanie()
         {
@@ -32 +25 @@
             bazyComboBox.SelectedIndex = 0;
         }
-
-        #endregion Constructors
 
         #region Methods (6)
@@ -174 +165 @@
                     reader.Dispose();
                 }
-                if (command != null) command.Dispose();
+
+                if (command != null)
+                    command.Dispose();
 
                 if (conn != null)
@@ -196 +189 @@
             sqlBldr.UserID = textBox1.Text;
             sqlBldr.Password = textBox2.Text;
-            sqlBldr.ConnectTimeout = 200000;
+            sqlBldr.ConnectTimeout = 180;// 200000;
             sqlBldr.ApplicationName = "BazaReklam_v" + Application.ProductVersion;
 
@@ -238 +231 @@
         private static bool SprawdzWersje()
         {
-            SqlCommand cmd = null;
+            SqlConnection conn = null;
             try
             {
-                cmd = new SqlCommand("SELECT ver FROM dbo.app WHERE [name]='BazaReklam'");
-                cmd.Connection =
-                    new SqlConnection("Data Source=" + ConnString.GetDataSource() + ";Initial Catalog=Applications;Persist Security Info=True;User=updater;Password=UpdateSolution;Application Name=BazaReklam_v" + Application.ProductVersion + ";");
-                
-
-                cmd.Connection.Open();
-                string ver = (string) cmd.ExecuteScalar();
-                cmd.Connection.Close();
+                conn = new SqlConnection("Data Source=" + ConnString.GetDataSource() + ";Initial Catalog=Applications;Persist Security Info=True;User=updater;Password=UpdateSolution;Application Name=BazaReklam_v" + Application.ProductVersion + ";");
+                conn.Open();
+
+                SqlCommand cmd = conn.CreateCommand();
+                cmd.CommandText = "SELECT ver FROM dbo.app WHERE [name]='BazaReklam'";
+                string ver = (string)cmd.ExecuteScalar();
 
                 if (ver.Trim() != Application.ProductVersion)
@@ -261 +252 @@
             finally
             {
-                if (cmd != null)
-                {
-                    if (cmd.Connection != null)
-                    {
-                        cmd.Connection.Close();
-                        cmd.Connection.Dispose();
-                    }
-                    cmd.Dispose();
+                if (conn != null)
+                {
+                    conn.Close();
+                    conn = null;
                 }
             }