bug fix

3 files changed, 4 insertions, 1 deletions

diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index d7478d58792..6d103a7654d 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -48,7 +48,7 @@ public:
 	    _stop = IceUtil::Time::now();
 	}
 
-	return (_stop - _start) / 1000.0;
+	return (_stop - _start) * 1000.0;
     }
 
 private:
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 4c5779ff07a..75b457a5897 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1682,6 +1682,7 @@ Slice::JavaGenerator::writeGenericSequenceMarshalUnmarshalCode(Output& out,
                 writeGenericMarshalUnmarshalCode(out, scope, seq->type(), "\"e\"", "__elem", false, iter, false);
                 out << nl << v << ".add(__elem);";
                 out << eb;
+                out << nl << stream << ".endReadSequence();";
             }
         }
     }
diff --git a/cpp/src/slice2xsd/Gen.cpp b/cpp/src/slice2xsd/Gen.cpp
index b93dc8eeead..1cc2e94a7ff 100644
--- a/cpp/src/slice2xsd/Gen.cpp
+++ b/cpp/src/slice2xsd/Gen.cpp
@@ -392,6 +392,8 @@ Slice::Gen::visitDictionary(const DictionaryPtr& p)
     os << "xs:complexType name=\"" <<  internalId << scopeId << p->name() << "ContentType\"";
     O << se(os.str());
 
+    annotate("struct");
+
     O << se("xs:sequence");
 
     O.inc();