2 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 7dc3289b546..96440d6632e 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -800,10 +800,12 @@ Slice::Gen::HolderVisitor::HolderVisitor(const string& dir,
 {
 }
 
-void
-Slice::Gen::HolderVisitor::visitClassDecl(const ClassDeclPtr& p)
+bool
+Slice::Gen::HolderVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
-    writeHolder(p);
+    ClassDeclPtr decl = p->declaration();
+    writeHolder(decl);
+    return false;
 }
 
 bool
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 798751d9cf2..dba800d4eed 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -113,7 +113,7 @@ private:
 
         HolderVisitor(const std::string&, const std::string&);
 
-        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual bool visitStructStart(const StructPtr&);
         virtual void visitSequence(const SequencePtr&);
         virtual void visitDictionary(const DictionaryPtr&);