Fixed a whole pile of code generation bugs:

- Lots of problems when Java keywords were used as Slice identifiers.
- Incorrect code generation if a base interface had an "amd" or "ami"
    metadata directive, but the derived class did not have it.
- Incorrect code generation for implementation stubs for some "amd"
    constructs.

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 97d467f1122..26f12c5ffa3 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -364,7 +364,11 @@ Slice::JavaGenerator::getAbsolute(const ContainedPtr& cont,
                                   const string& prefix,
                                   const string& suffix) const
 {
-    string name = fixKwd(cont->name());
+    string name = cont->name();
+    if(prefix == "" && suffix == "")
+    {
+        name = fixKwd(name);
+    }
     string contPkg = getPackage(cont);
     if(contPkg == package)
     {