ICE-5677 consistent checking of boolean properties

1 files changed, 18 insertions, 18 deletions

diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index e8c95c333b8..0ba9368c797 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -73,7 +73,7 @@ CtrlCHandlerCallback _previousCallback = 0;
 
 //
 // Variables that are immutable during run() and until communicator->destroy() has returned;
-// before and after run(), and once communicator->destroy() has returned, we assume that 
+// before and after run(), and once communicator->destroy() has returned, we assume that
 // only the main thread and CtrlCHandler threads are running.
 //
 CtrlCHandler* _ctrlCHandler = 0;
@@ -109,7 +109,7 @@ holdInterruptCallback(int signal)
         {
             IceInternal::Application::_condVar->wait(lock);
         }
-        
+
         if(IceInternal::Application::_destroyed)
         {
             //
@@ -120,7 +120,7 @@ holdInterruptCallback(int signal)
         assert(_ctrlCHandler != 0);
         callback = _ctrlCHandler->getCallback();
     }
-    
+
     if(callback != 0)
     {
         callback(signal);
@@ -149,7 +149,7 @@ destroyOnInterruptCallback(int signal)
         IceInternal::Application::_interrupted = true;
         IceInternal::Application::_destroyed = true;
     }
-        
+
     try
     {
         assert(IceInternal::Application::_communicator != 0);
@@ -367,7 +367,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
     if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
     {
         const bool convert = initializationData.properties ?
-                initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) == 1 &&
+                initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initializationData.properties->getProperty("Ice.StdErr").empty() : true;
         setProcessLogger(new LoggerI(argv[0], "", convert, IceUtil::getProcessStringConverter()));
     }
@@ -379,7 +379,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
         return EXIT_FAILURE;
     }
     int status;
-    
+
     //
     // We parse the properties here to extract Ice.ProgramName.
     //
@@ -400,9 +400,9 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
         out << "unknown exception";
         return EXIT_FAILURE;
     }
-    IceInternal::Application::_appName = initData.properties->getPropertyWithDefault("Ice.ProgramName", 
+    IceInternal::Application::_appName = initData.properties->getPropertyWithDefault("Ice.ProgramName",
                                                                                  IceInternal::Application::_appName);
-    
+
     //
     // Used by destroyOnInterruptCallback and shutdownOnInterruptCallback.
     //
@@ -420,12 +420,12 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
             //
             CtrlCHandler ctrCHandler;
             _ctrlCHandler = &ctrCHandler;
-            
+
             status = doMain(argc, argv, initData);
 
             //
             // Set _ctrlCHandler to 0 only once communicator->destroy() has completed.
-            // 
+            //
             _ctrlCHandler = 0;
         }
         catch(const CtrlCHandlerException&)
@@ -439,18 +439,18 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initial
     {
         status = doMain(argc, argv, initData);
     }
-   
+
     return status;
 }
 
-int 
+int
 Ice::Application::main(int argc, char* const argv[], const char* configFile)
 {
     ArgVector av(argc, argv);
     return main(av.argc, av.argv, configFile);
 }
 
-int 
+int
 Ice::Application::main(int argc, char* const argv[], const Ice::InitializationData& initData)
 {
     ArgVector av(argc, argv);
@@ -530,7 +530,7 @@ Ice::Application::shutdownOnInterrupt()
     else
     {
         Warning out(getProcessLogger());
-        out << "interrupt method called on Application configured to not handle interrupts."; 
+        out << "interrupt method called on Application configured to not handle interrupts.";
     }
 }
 
@@ -620,7 +620,7 @@ Ice::Application::releaseInterrupt()
                 // setting _released to true and signalling _condVar
                 // do no harm.
                 //
-            
+
                 _released = true;
                 _ctrlCHandler->setCallback(_previousCallback);
                 IceInternal::Application::_condVar->signal();
@@ -657,8 +657,8 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD
         //
         if(initData.properties->getProperty("Ice.ProgramName") != "" && LoggerIPtr::dynamicCast(getProcessLogger()))
         {
-            const bool convert = 
-                initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) == 1 &&
+            const bool convert =
+                initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initData.properties->getProperty("Ice.StdErr").empty();
 
             setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert,
@@ -667,7 +667,7 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD
 
         IceInternal::Application::_communicator = initialize(argc, argv, initData);
         IceInternal::Application::_destroyed = false;
-    
+
         //
         // The default is to destroy when a signal is received.
         //