Fix SQL error with Merge entities and don't ignore some errors
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2936826
This commit is contained in:
parent
b8f54de8f9
commit
24ee390c32
|
@ -160,7 +160,7 @@ public class Merge
|
|||
}
|
||||
//
|
||||
if ( success )
|
||||
m_trx.commit();
|
||||
success = m_trx.commit();
|
||||
else
|
||||
m_trx.rollback();
|
||||
|
||||
|
@ -170,6 +170,7 @@ public class Merge
|
|||
catch (Exception ex)
|
||||
{
|
||||
log.log(Level.SEVERE, ColumnName, ex);
|
||||
success = false;
|
||||
}
|
||||
// Cleanup
|
||||
try
|
||||
|
|
Loading…
Reference in New Issue