Strange part in connectivity/source/drivers/jdbc/tools.cxx

Hello,

I noticed this part:
    113         // this is a special property to find the jdbc driver
    114         if  (   pBegin->Name.compareToAscii( "JavaDriverClass" )
    115             &&  pBegin->Name.compareToAscii( "JavaDriverClassPath" )
    116             &&  pBegin->Name.compareToAscii( "SystemProperties" )
    117             &&  pBegin->Name.compareToAscii( "CharSet" )
etc.

See
http://opengrok.libreoffice.org/xref/core/connectivity/source/drivers/jdbc/tools.cxx#113

Looking at git history, I found:
- initial import (in 2000), if(!bFound ||
pBegin->Name.compareToAscii("JDBCDRV")) 
- then f(!pBegin->Name.compareToAscii("JDBCDRV"))
(1d58d0115e25d2be02cdbccbf10573927a1d6371)
- if(!pBegin->Name.compareToAscii("JavaDriverClass"))
(a3a2a42839a754c604e24f02f7dc8629525435ea)

But then:
- if(pBegin->Name.compareToAscii("JavaDriverClass")) from 2001
(53ca3ba5619c2952bb39d643f45a916f8e5005b2)
-         if( pBegin->Name.compareToAscii("JavaDriverClass") &&
            pBegin->Name.compareToAscii("CharSet"))
(e8ffa01cda7c46398e4d85d51c90b5d1092595b5)

and it goes on...

1) So either all the "&&" should be replaced by "||" or "!" should be put
back and set for each one or did I miss something obvious?

2) Should we complete this similar list here:
http://opengrok.libreoffice.org/xref/core/dbaccess/source/inc/stringconstants.inc#220
(used here :
http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/dlg/DbAdminImpl.cxx#175)
and use alias macros? 

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Strange-part-in-connectivity-source-drivers-jdbc-tools-cxx-tp4110680.html
Sent from the Dev mailing list archive at Nabble.com.