Skip to content

Commit 91f2314

Browse files
author
Claudia Beatriz Murialdo Garrone
committed
Merge branch 'beta' of https://github.com/genexuslabs/DotNetClasses into beta
2 parents c1141fe + 2ede891 commit 91f2314

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataADO.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected GxConnectionManager()
8787
}
8888
catch(Exception e){
8989

90-
GXLogging.Error(log, "Error setting CONN_TIMEOUT ", e);
90+
GXLogging.Error(log, "Error setting CONN_TIMEOUT ", e.Message, e);
9191
}
9292
}
9393

@@ -209,7 +209,7 @@ public void RemoveAllConnections(int handle)
209209
}
210210
catch(Exception e)
211211
{
212-
GXLogging.Error(log, "RemoveAllConnections Error", e);
212+
GXLogging.Error(log, "RemoveAllConnections Error", e.Message,e);
213213
throw e;
214214
}
215215
}
@@ -526,7 +526,7 @@ public void Open()
526526
}
527527
catch (Exception ex)
528528
{
529-
GXLogging.Error(log, "GxConnection.Open Error ", ex);
529+
GXLogging.Error(log, "GxConnection.Open Error ", ex.Message, ex);
530530
lastErrorCode = 3;
531531
lastErrorMsg = "Internal error: Function call failed (" + ex.Message + ")";
532532
throw ex;
@@ -548,7 +548,7 @@ public void Open()
548548
int status=0;
549549
if (!m_dataRecord.ProcessError(e.DBMSErrorCode, e.ErrorInfo, GxErrorMask.GX_NOMASK, this, ref status, ref retry, 0))
550550
{
551-
GXLogging.Error(log, "GxConnection.Open Error ",e);
551+
GXLogging.Error(log, "GxConnection.Open Error ", e.Message, e);
552552
lastErrorCode = 3;
553553
lastErrorMsg = "Internal error: Function call failed ("+ e.ErrorInfo + ")";
554554
throw e;
@@ -700,7 +700,7 @@ public short FullConnect()
700700
}
701701
catch(Exception ex)
702702
{
703-
GXLogging.Error(log, "FullConnect Error " + databaseName, ex);
703+
GXLogging.Error(log, "FullConnect Error " + databaseName, ex.Message, ex);
704704
return 1;
705705
}
706706
}
@@ -1466,7 +1466,7 @@ public GxCommand( IGxDataRecord db, String statement, IGxDataStore ds, int ttl,
14661466
bool retry=false;
14671467
if (! dataRecord.ProcessError( e.DBMSErrorCode, e.ErrorInfo, errMask, con, ref status, ref retry, 0))
14681468
{
1469-
GXLogging.Error(log, "Return Error GxCommand ", e);
1469+
GXLogging.Error(log, "Return Error GxCommand ", e.Message, e);
14701470
throw (new GxADODataException(e.ErrorInfo, e));
14711471
}
14721472
}
@@ -1593,7 +1593,7 @@ public int ExecuteNonQuery()
15931593
}
15941594
catch { }
15951595
}
1596-
GXLogging.Error(log, e, "Return GxCommand.ExecuteNonQuery Error ");
1596+
GXLogging.Error(log, "Return GxCommand.ExecuteNonQuery Error ", e.Message, e);
15971597
try
15981598
{
15991599
con.MonitorExit();
@@ -1689,7 +1689,7 @@ private IDataReader ExecRpc()
16891689
}
16901690
catch(Exception e)
16911691
{
1692-
GXLogging.Error(log, e, "Return GxCommand.ExecRpc Error ");
1692+
GXLogging.Error(log,"Return GxCommand.ExecRpc Error ", e.Message, e);
16931693
throw (new GxADODataException(e));
16941694
}
16951695
finally
@@ -1728,7 +1728,7 @@ public string ExecuteDataSet()
17281728
}
17291729
catch(Exception e)
17301730
{
1731-
GXLogging.Error(log, e, "Return GxCommand.ExecuteDataSet Error ");
1731+
GXLogging.Error(log, "Return GxCommand.ExecuteDataSet Error ", e.Message, e);
17321732
throw (new GxADODataException(e));
17331733
}
17341734
}
@@ -1738,7 +1738,7 @@ public string ExecuteDataSet()
17381738
retryCount++;
17391739
if (! pe)
17401740
{
1741-
GXLogging.Error(log, e, "GxCommand.ExecuteDataSet Error ");
1741+
GXLogging.Error(log, "GxCommand.ExecuteDataSet Error ", e.Message, e);
17421742
throw;
17431743
}
17441744
}
@@ -1805,7 +1805,7 @@ public IDataReader ExecuteReader()
18051805
}
18061806
catch (Exception e)
18071807
{
1808-
GXLogging.Error(log, "Return GxCommand.ExecuteReader Error ", e);
1808+
GXLogging.Error(log, "Return GxCommand.ExecuteReader Error ", e.Message, e);
18091809
if (e.InnerException != null)
18101810
{
18111811
GXLogging.Error(log, "Inner Error", e.InnerException);
@@ -1839,7 +1839,7 @@ public void FetchData(out IDataReader dr)
18391839
retryCount++;
18401840
if (! pe)
18411841
{
1842-
GXLogging.Error(log, e, "GxCommand.FetchData Error ");
1842+
GXLogging.Error(log, "GxCommand.FetchData Error ", e.Message, e);
18431843
throw;
18441844
}
18451845
}
@@ -1866,7 +1866,7 @@ public void FetchDataRPC(out IDataReader dr)
18661866
retryCount++;
18671867
if (! pe)
18681868
{
1869-
GXLogging.Error(log, e, "GxCommand.FetchDataRPC Error ");
1869+
GXLogging.Error(log, "GxCommand.FetchDataRPC Error ", e.Message, e);
18701870
throw;
18711871
}
18721872
}
@@ -1923,7 +1923,7 @@ public int ExecuteBatchQuery()
19231923
}
19241924
catch (Exception e)
19251925
{
1926-
GXLogging.Error(log, "Return GxCommand.ExecuteNonQuery Error ", e);
1926+
GXLogging.Error(log, "Return GxCommand.ExecuteNonQuery Error ", e.Message, e);
19271927
con.InternalConnection.RollbackSavePoint(Transaction, stmtId);
19281928
con.MonitorExit();
19291929
throw (new GxADODataException(e));
@@ -1988,7 +1988,7 @@ public void ExecuteBatch()
19881988
retryCount++;
19891989
if (!pe)
19901990
{
1991-
GXLogging.Error(log, "GxCommand.ExecuteStmt Error ", e);
1991+
GXLogging.Error(log, "GxCommand.ExecuteStmt Error ", e.Message, e);
19921992
throw;
19931993
}
19941994
}
@@ -2017,7 +2017,7 @@ private void execStmt()
20172017
retryCount++;
20182018
if (!pe)
20192019
{
2020-
GXLogging.Error(log, "GxCommand.ExecuteStmt Error ", e);
2020+
GXLogging.Error(log, "GxCommand.ExecuteStmt Error ", e.Message, e);
20212021
throw;
20222022
}
20232023
}
@@ -2599,7 +2599,7 @@ private void Initialize(IGxDataRecord db, string id, int hnd, IGxContext context
25992599
}
26002600
catch (Exception ex)
26012601
{
2602-
GXLogging.Error(log, "Error creating CustomDataRecord " + providerService.ClassName, ex);
2602+
GXLogging.Error(log, "Error creating CustomDataRecord " + providerService.ClassName, ex.Message, ex);
26032603
}
26042604
}
26052605
}

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ public virtual IDbCommand GetCommand(IGxConnection con, string stmt, GxParameter
829829
}
830830
catch (Exception ex)
831831
{
832-
GXLogging.Error(log, "Set Binary parameter length in cached command error", ex);
832+
GXLogging.Error(log, "Set Binary parameter length in cached command error", ex.Message, ex);
833833
}
834834
}
835835
}
@@ -1963,7 +1963,7 @@ public override void GetValues(IDataReader reader, ref object[] values)
19631963
}
19641964
catch (Exception ex)
19651965
{
1966-
GXLogging.Error(log, "GetValues error", ex);
1966+
GXLogging.Error(log, "GetValues error", ex.Message, ex);
19671967
}
19681968
}
19691969
static internal decimal ReadSQLDecimal(SqlDataReader sqlReader, int idx) {
@@ -2261,7 +2261,7 @@ public bool Read()
22612261
}
22622262
catch (Exception ex)
22632263
{
2264-
GXLogging.Error(log, "ReadError", ex);
2264+
GXLogging.Error(log, "ReadError", ex.Message, ex);
22652265
throw (new GxADODataException(ex));
22662266
}
22672267
}
@@ -3162,7 +3162,7 @@ public void unprepare(int cursorId )
31623162
}
31633163
catch (Exception e)
31643164
{
3165-
GXLogging.Error(log, "GxCommand.unprepare Error ", e);
3165+
GXLogging.Error(log, "GxCommand.unprepare Error ", e.Message, e);
31663166
}
31673167
}
31683168
public void UnprepareClear()
@@ -3324,7 +3324,7 @@ public void LoadBlock()
33243324
{
33253325
if (reader != null) reader.Close();
33263326
GXLogging.Error(log, "stmt:" + this.stmt);
3327-
GXLogging.Error(log, "LoadBlock error ", e);
3327+
GXLogging.Error(log, "LoadBlock error ", e.Message, e);
33283328

33293329
Dispose();
33303330
hasnext = false;

‎dotnet/src/dotnetframework/GxClasses/Data/GXDataNTier.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ private void execute(int cursor, Object[] parms, bool batch)
476476
}
477477
catch (Exception ex)
478478
{
479-
GXLogging.Error(log, "Execute error", ex);
479+
GXLogging.Error(log, "Execute error", ex.Message, ex);
480480
_ds.CloseConnections();
481481
throw ex;
482482
}
@@ -520,7 +520,7 @@ public void readNext(int cursor)
520520
if (oCur != null)
521521
{
522522
bool pe = oCur.Command.ProcessException(e, ref retry, retryCount, "FETCH");
523-
GXLogging.Error(log, "readNext Error", e);
523+
GXLogging.Error(log, "readNext Error", e.Message, e);
524524
if (!pe)
525525
{
526526
throw;
@@ -579,7 +579,7 @@ private void commitDataStore(IGxDataStore ds, String auditObjectName)
579579
GxADODataException e = new GxADODataException(dbEx);
580580
bool retry = false;
581581
int retryCount = 0;
582-
GXLogging.Error(log, "Commit Transaction Error", e);
582+
GXLogging.Error(log, "Commit Transaction Error", e.Message, e);
583583
bool pe = cmd.ProcessException(e, ref retry, retryCount, "FETCH");
584584
if (!pe)
585585
{
@@ -590,7 +590,7 @@ private void commitDataStore(IGxDataStore ds, String auditObjectName)
590590
}
591591
catch (Exception ex)
592592
{
593-
GXLogging.Error(log, "beginTransaction in commit transaction failed", ex);
593+
GXLogging.Error(log, "beginTransaction in commit transaction failed",ex.Message, ex);
594594
throw (new GxADODataException(e.ToString(), e));
595595
}
596596
}
@@ -612,7 +612,7 @@ private void rollbackDataStore(IGxDataStore ds, String auditObjectName)
612612
bool retry = false;
613613
int retryCount = 0;
614614
bool pe = cmd.ProcessException(e, ref retry, retryCount, "FETCH");
615-
GXLogging.Error(log, "Rollback Transaction Error", e);
615+
GXLogging.Error(log, "Rollback Transaction Error", e.Message, e);
616616
if (!pe)
617617
{
618618
try
@@ -622,7 +622,7 @@ private void rollbackDataStore(IGxDataStore ds, String auditObjectName)
622622
}
623623
catch (Exception ex)
624624
{
625-
GXLogging.Error(log, "beginTransaction in Rollback transaction failed", ex);
625+
GXLogging.Error(log, "beginTransaction in Rollback transaction failed", ex.Message, ex);
626626
throw (new GxADODataException(e.ToString(), e));
627627
}
628628
}

0 commit comments

Comments
 (0)