diff options
| author | Mark Spruiell <mes@zeroc.com> | 2005-07-14 18:13:12 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2005-07-14 18:13:12 +0000 |
| commit | 82f82f6ab1be258e9efebf9dab0e1cd6e1e33899 (patch) | |
| tree | 7ec0ea486395be24ac39cd6a16f0fe1210d4c97d /cpp/src/Slice/JavaUtil.cpp | |
| parent | It is not possible to compile the client side library with router support. (diff) | |
| download | ice-82f82f6ab1be258e9efebf9dab0e1cd6e1e33899.tar.bz2 ice-82f82f6ab1be258e9efebf9dab0e1cd6e1e33899.tar.xz ice-82f82f6ab1be258e9efebf9dab0e1cd6e1e33899.zip | |
metadata fixes for IceE
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 3a36e81e6fc..95b64c3c016 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -463,7 +463,6 @@ Slice::JavaGenerator::typeToString(const TypePtr& type, DictionaryPtr dict = DictionaryPtr::dynamicCast(type); if(dict) { - string dictType = findMetaData(metaData); if(mode == TypeModeOut) { return getAbsolute(dict, package, "", "Holder"); @@ -475,6 +474,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type, return "java.util.Hashtable"; } + string dictType = findMetaData(metaData); if(dictType.empty()) { StringList l = dict->getMetaData(); @@ -852,19 +852,23 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, // the type's Helper class for marshalling - we must // generate marshalling code inline. // - string listType = findMetaData(metaData); - StringList typeMetaData = seq->getMetaData(); - if(listType.empty()) - { - listType = findMetaData(typeMetaData); - } - else + string listType; + if(_featureProfile != Slice::IceE) { - string s = findMetaData(typeMetaData); - if(listType != s) - { - useHelper = false; - } + listType = findMetaData(metaData); + StringList typeMetaData = seq->getMetaData(); + if(listType.empty()) + { + listType = findMetaData(typeMetaData); + } + else + { + string s = findMetaData(typeMetaData); + if(listType != s) + { + useHelper = false; + } + } } // @@ -896,7 +900,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out, // Stop if the inner sequence type has metadata. // string m = findMetaData(s->getMetaData()); - if(!m.empty()) + if(!m.empty() && _featureProfile != Slice::IceE) { break; } |