From 9e6efaee34e0d7836812ca70eb30c9cd5561b71c Mon Sep 17 00:00:00 2001
From: Michi Henning <michi@zeroc.com>
Date: Wed, 8 Sep 2004 07:04:46 +0000
Subject: 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.

---
 cpp/src/Slice/JavaUtil.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cpp/src/Slice/JavaUtil.cpp')

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)
     {
-- 
cgit v1.2.3