diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:18:30 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-27 14:18:30 +0200 |
commit | 63988ba095656ae0629a52a2ac8c2930ac4ddc20 (patch) | |
tree | d340ff31a2468e8b2ce38d8aa5738d0e362e2f8d /runtime/prop.c | |
parent | ede0dbf1a3ee528f059903d4dfad96a91fe55186 (diff) | |
parent | fa9684d8c6faa8f2e808de9229b254d77844aa2c (diff) | |
download | rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.tar.gz rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.tar.bz2 rsyslog-63988ba095656ae0629a52a2ac8c2930ac4ddc20.zip |
Merge branch 'master' into java
Diffstat (limited to 'runtime/prop.c')
-rw-r--r-- | runtime/prop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/prop.c b/runtime/prop.c index 804f3491..d188b2ed 100644 --- a/runtime/prop.c +++ b/runtime/prop.c @@ -174,7 +174,7 @@ rsRetVal CreateOrReuseStringProp(prop_t **ppThis, uchar *psz, int len) } else { /* already exists, check if we can re-use it */ GetString(*ppThis, &pszPrev, &lenPrev); - if(len != lenPrev && ustrcmp(psz, pszPrev)) { + if(len != lenPrev || ustrcmp(psz, pszPrev)) { /* different, need to discard old & create new one */ propDestruct(ppThis); CHKiRet(CreateStringProp(ppThis, psz, len)); |