diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 09:17:35 -0400 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 09:17:35 -0400 |
| commit | e603bacb014c8d03b64a601aee354d8dff25cca0 (patch) | |
| tree | 11f1b528bb7d7973a2b1f8e2f9fec645169e8ed7 /cpp/src/Ice/ReferenceFactory.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2312 - changed 64 bit bin ... (diff) | |
| download | ice-e603bacb014c8d03b64a601aee354d8dff25cca0.tar.bz2 ice-e603bacb014c8d03b64a601aee354d8dff25cca0.tar.xz ice-e603bacb014c8d03b64a601aee354d8dff25cca0.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/ReferenceFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 5ba3c621c12..4c055017f68 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -541,7 +541,7 @@ IceInternal::ReferenceFactory::create(const string& str) throw ex; } - if(_instance->initializationData().stringConverter) + if(_instance->initializationData().stringConverter && !adapter.empty()) { string tmpAdapter; _instance->initializationData().stringConverter->fromUTF8( |