History

Merge branch 'master' of https://github.com/GridProtectionAlliance/gsf.git

Ritchie Carroll committed 10 years ago

Commit cdb348a2 parents fddf777 d8c40b21 file · +12 −9Browse files

Unified · Split

Source/Libraries/GSF.Web/Security/SecurityHub.cs+12−9
@@ -106,18 +106,21 @@ namespace GSF.Web.Security · 105 unmodified lines
106106 DefaultNodeID = Guid.Parse(systemSettings["NodeID"].Value.ToNonNullString(Guid.NewGuid().ToString()));
107107
108108 // Determine whether the node exists in the database and create it if it doesn't
109− using (AdoDataConnection connection = new AdoDataConnection("securityProvider"))
109+ if (DefaultNodeID != Guid.Empty)
110110 {
111− const string NodeCountFormat = "SELECT COUNT(*) FROM Node";
112− const string NodeInsertFormat = "INSERT INTO Node(Name, Description, Enabled) VALUES('Default', 'Default node', 1)";
113− const string NodeUpdateFormat = "UPDATE Node SET ID = {0}";
111+ using (AdoDataConnection connection = new AdoDataConnection("securityProvider"))
112+ {
113+ const string NodeCountFormat = "SELECT COUNT(*) FROM Node";
114+ const string NodeInsertFormat = "INSERT INTO Node(Name, Description, Enabled) VALUES('Default', 'Default node', 1)";
115+ const string NodeUpdateFormat = "UPDATE Node SET ID = {0}";
114116
115− int nodeCount = connection.ExecuteScalar<int?>(NodeCountFormat) ?? 0;
117+ int nodeCount = connection.ExecuteScalar<int?>(NodeCountFormat) ?? 0;
116118
117− if (nodeCount == 0)
118− {
119− connection.ExecuteNonQuery(NodeInsertFormat);
120− connection.ExecuteNonQuery(NodeUpdateFormat, connection.Guid(DefaultNodeID));
119+ if (nodeCount == 0)
120+ {
121+ connection.ExecuteNonQuery(NodeInsertFormat);
122+ connection.ExecuteNonQuery(NodeUpdateFormat, connection.Guid(DefaultNodeID));
123+ }
121124 }
122125 }
123126 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t