Using general isc_network_error (DNET-813).

FirebirdSQL · Jan 23, 2019 · 0db4528 · 0db4528
1 parent 20cc9b3
commit 0db4528
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 deletions.
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsArray.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsArray.cs
@@ -114,7 +114,7 @@ public override byte[] GetSlice(int sliceLength)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -141,7 +141,7 @@ public override void PutSlice(Array sourceArray, int sliceLength)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -314,7 +314,7 @@ private byte[] ReceiveSliceResponse(ArrayDesc desc)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsBlob.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsBlob.cs
@@ -156,7 +156,7 @@ protected override byte[] GetSegment()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -173,7 +173,7 @@ protected override void PutSegment(byte[] buffer)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -236,7 +236,7 @@ private void CreateOrOpen(int op, BlobParameterBuffer bpb)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs
@@ -181,7 +181,7 @@ public virtual void Attach(DatabaseParameterBuffer dpb, string dataSource, int p
 			catch (IOException ex)
 			{
 				SafelyDetach();
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 
 			AfterAttachActions();
@@ -301,7 +301,7 @@ public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSourc
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -402,7 +402,7 @@ public virtual void ConnectionRequest(out int auxHandle, out string ipAddress, o
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -459,7 +459,7 @@ public void QueueEvents(RemoteEvent remoteEvent)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -477,7 +477,7 @@ public void CancelEvents(RemoteEvent events)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -621,7 +621,7 @@ public virtual void ReleaseObject(int op, int id)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs
@@ -86,7 +86,7 @@ public virtual void Attach(ServiceParameterBuffer spb, string dataSource, int po
 			catch (IOException ex)
 			{
 				_database.Detach();
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -157,7 +157,7 @@ public virtual void Start(ServiceParameterBuffer spb)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsStatement.cs
@@ -257,7 +257,7 @@ public override void Prepare(string commandText)
 			{
 				if (_state == StatementState.Allocated)
 					_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -302,7 +302,7 @@ public override void Execute()
 			catch (IOException ex)
 			{
 				_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -373,7 +373,7 @@ public override DbValue[] Fetch()
 				}
 				catch (IOException ex)
 				{
-					throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+					throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 				}
 			}
 
@@ -450,7 +450,7 @@ protected void DoInfoSqlPacket(byte[] items, int bufferLength)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -514,7 +514,7 @@ protected void DoFreePacket(int option)
 			catch (IOException ex)
 			{
 				_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -595,7 +595,7 @@ protected void ProcessStoredProcedureExecuteResponse(SqlResponse response)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 		#endregion
@@ -971,7 +971,7 @@ protected virtual byte[] WriteParameters()
 					}
 					catch (IOException ex)
 					{
-						throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+						throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 					}
 				}
 
@@ -1004,7 +1004,7 @@ protected virtual DbValue[] ReadRow()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 			return row;
 		}

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsTransaction.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsTransaction.cs
@@ -115,7 +115,7 @@ public override void BeginTransaction(TransactionParameterBuffer tpb)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -139,7 +139,7 @@ public override void Commit()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -163,7 +163,7 @@ public override void Rollback()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -183,7 +183,7 @@ public override void CommitRetaining()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -203,7 +203,7 @@ public override void RollbackRetaining()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -229,7 +229,7 @@ public override void Prepare()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -252,7 +252,7 @@ public override void Prepare(byte[] buffer)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs
@@ -82,7 +82,7 @@ public override void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string d
 			catch (IOException ex)
 			{
 				SafelyDetach();
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 
 			AfterAttachActions();
@@ -116,7 +116,7 @@ public override void ReleaseObject(int op, int id)
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs
@@ -95,7 +95,7 @@ public override void Prepare(string commandText)
 			{
 				if (_state == StatementState.Allocated)
 					_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 
@@ -165,7 +165,7 @@ public override void Execute()
 			catch (IOException ex)
 			{
 				_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsStatement.cs
@@ -109,7 +109,7 @@ public override void Execute()
 			catch (IOException ex)
 			{
 				_state = StatementState.Error;
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs
@@ -51,7 +51,7 @@ public override void Attach(DatabaseParameterBuffer dpb, string dataSource, int
 			catch (IOException ex)
 			{
 				SafelyDetach();
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 
 			AfterAttachActions();
@@ -98,7 +98,7 @@ public override void CreateDatabase(DatabaseParameterBuffer dpb, string dataSour
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsServiceManager.cs
@@ -39,7 +39,7 @@ public override void Attach(ServiceParameterBuffer spb, string dataSource, int p
 			catch (IOException ex)
 			{
 				Database.Detach();
-				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}
 

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsStatement.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsStatement.cs
@@ -79,7 +79,7 @@ protected override byte[] WriteParameters()
 				}
 				catch (IOException ex)
 				{
-					throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+					throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 				}
 
 			}
@@ -109,7 +109,7 @@ protected override DbValue[] ReadRow()
 			}
 			catch (IOException ex)
 			{
-				throw IscException.ForErrorCode(IscCodes.isc_net_read_err, ex);
+				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
 		}