diff options
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 6 | ||||
| -rw-r--r-- | cs/src/Ice/Instance.cs | 6 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 8 | ||||
| -rw-r--r-- | js/src/Ice/Instance.js | 7 |
4 files changed, 15 insertions, 12 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index f4b0d89c90c..eb2e998a74b 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -87,7 +87,7 @@ namespace { IceUtil::Mutex* staticMutex = 0; -bool oneOffDone = false; +bool oneOfDone = false; std::list<IceInternal::Instance*>* instanceList = 0; #ifndef _WIN32 @@ -908,7 +908,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _initData.properties = createProperties(); } - if(!oneOffDone) + if(!oneOfDone) { // // StdOut and StdErr redirection @@ -997,7 +997,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi } } #endif - oneOffDone = true; + oneOfDone = true; } if(instanceCount() == 1) diff --git a/cs/src/Ice/Instance.cs b/cs/src/Ice/Instance.cs index 14fcce1f716..24f4d07c691 100644 --- a/cs/src/Ice/Instance.cs +++ b/cs/src/Ice/Instance.cs @@ -652,7 +652,7 @@ namespace IceInternal #if !SILVERLIGHT && !UNITY lock(_staticLock) { - if(!_oneOffDone) + if(!_oneOfDone) { string stdOut = _initData.properties.getProperty("Ice.StdOut"); string stdErr = _initData.properties.getProperty("Ice.StdErr"); @@ -700,7 +700,7 @@ namespace IceInternal } } - _oneOffDone = true; + _oneOfDone = true; } } #endif @@ -1307,7 +1307,7 @@ namespace IceInternal #endif #if !SILVERLIGHT && !UNITY - private static bool _oneOffDone = false; + private static bool _oneOfDone = false; #endif private static System.Object _staticLock = new System.Object(); diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index e52546b26fa..e5ca5e8a71c 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -638,7 +638,7 @@ public final class Instance synchronized(Instance.class) { - if(!_oneOffDone) + if(!_oneOfDone) { String stdOut = _initData.properties.getProperty("Ice.StdOut"); String stdErr = _initData.properties.getProperty("Ice.StdErr"); @@ -688,7 +688,7 @@ public final class Instance } } - _oneOffDone = true; + _oneOfDone = true; } } @@ -1152,7 +1152,7 @@ public final class Instance queueExecutor = _queueExecutor; _queueExecutor = null; - + _typeToClassMap.clear(); _state = StateDestroyed; @@ -1334,6 +1334,6 @@ public final class Instance final private String[] _packages; final private boolean _useApplicationClassLoader; - private static boolean _oneOffDone = false; + private static boolean _oneOfDone = false; private ExecutorService _queueExecutor; } diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js index c85ec1f41c9..5ec9eb72cb1 100644 --- a/js/src/Ice/Instance.js +++ b/js/src/Ice/Instance.js @@ -292,9 +292,12 @@ var Instance = Ice.Class({ this._initData.properties = Properties.createProperties(); } - if(this._initData.properties.getPropertyAsIntWithDefault("Ice.PrintStackTraces", 0) > 0) + if(Ice.__oneOfDone === undefined) { - Ice.__printStackTraces = true; + Ice.__printStackTraces = + this._initData.properties.getPropertyAsIntWithDefault("Ice.PrintStackTraces", 0) > 0; + + Ice.__oneOfDone = true; } if(this._initData.logger === null) |