diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 11:16:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 11:16:31 +0200 |
| commit | 18db197129260d77414d6a0fe4b1e75f80526cd7 (patch) | |
| tree | dd44adc77350939c4ce1def8b3bd306307a53bf0 /runtime/modules.c | |
| parent | 3424f701667487793c179a6904e73e269235995f (diff) | |
| parent | c440ae1d15d78a41477a408688c838a36b6d483f (diff) | |
| download | rsyslog-18db197129260d77414d6a0fe4b1e75f80526cd7.tar.gz rsyslog-18db197129260d77414d6a0fe4b1e75f80526cd7.tar.bz2 rsyslog-18db197129260d77414d6a0fe4b1e75f80526cd7.zip | |
Merge branch 'master' into java
Diffstat (limited to 'runtime/modules.c')
| -rw-r--r-- | runtime/modules.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index b588909e..eee3b46e 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -466,10 +466,12 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_ ABORT_FINALIZE(localRet); localRet = (*pNew->modQueryEtryPt)((uchar*)"endTransaction", &pNew->mod.om.endTransaction); - if(localRet == RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) - pNew->mod.om.beginTransaction = dummyEndTransaction; - else if(localRet != RS_RET_OK) + if(localRet == RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) { + pNew->mod.om.endTransaction = dummyEndTransaction; + //pNew->mod.om.beginTransaction = dummyEndTransaction; + } else if(localRet != RS_RET_OK) { ABORT_FINALIZE(localRet); + } break; case eMOD_LIB: break; |