Fixed ICE-7493 - Support for java try-with and Python with statements for the Ice.Communicator

1 files changed, 14 insertions, 1 deletions

diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3c6d0ece494..642b16f7e1f 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -396,6 +396,11 @@ private:
                         result.push_back(s);
                         continue;
                     }
+                    else if(s.substr(prefix.size(), pos - prefix.size()) == "implements")
+                    {
+                        result.push_back(s);
+                        continue;
+                    }
 
                     emitWarning(cont->file(), cont->line(), "ignoring invalid metadata `" + s + "'");
                 }
@@ -455,7 +460,7 @@ private:
             else if(i->find("java:protobuf:") == 0 || i->find("java:serializable:") == 0)
             {
                 //
-                // Only valid in sequence defintion which is checked in visitSequence
+                // Only valid in sequence definition which is checked in visitSequence
                 //
                 emitWarning(file, line, "ignoring invalid metadata `" + *i + "'");
             }
@@ -468,6 +473,14 @@ private:
                 }
                 emitWarning(file, line, "ignoring invalid metadata `" + *i + "'");
             }
+            else if(i->find("java:implements:") == 0)
+            {
+                if(ClassDefPtr::dynamicCast(p) || StructPtr::dynamicCast(p))
+                {
+                    continue;
+                }
+                emitWarning(file, line, "ignoring invalid metadata `" + *i + "'");
+            }
         }
     }