Fix (ICE-7762) - Change dispatch bool return value

8 files changed, 44 insertions, 46 deletions

diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index aa053d59d1d..0b4a3295126 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -137,7 +137,7 @@ Ice::Object::_iceD_ice_isA(Incoming& inS, const Current& current)
     OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret);
     inS.endWriteParams();
-    return false;
+    return true;
 }
 
 bool
@@ -146,7 +146,7 @@ Ice::Object::_iceD_ice_ping(Incoming& inS, const Current& current)
     inS.readEmptyParams();
     ice_ping(current);
     inS.writeEmptyParams();
-    return false;
+    return true;
 }
 
 bool
@@ -157,7 +157,7 @@ Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current)
     OutputStream* ostr = inS.startWriteParams();
     ostr->write(&ret[0], &ret[0] + ret.size(), false);
     inS.endWriteParams();
-    return false;
+    return true;
 }
 
 bool
@@ -168,7 +168,7 @@ Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current)
     OutputStream* ostr = inS.startWriteParams();
     ostr->write(ret, false);
     inS.endWriteParams();
-    return false;
+    return true;
 }
 
 
@@ -356,7 +356,7 @@ Ice::Blobject::_iceDispatch(Incoming& in, const Current& current)
     {
         in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok);
     }
-    return false;
+    return true;
 }
 
 bool
@@ -376,7 +376,7 @@ Ice::BlobjectArray::_iceDispatch(Incoming& in, const Current& current)
     {
         in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok);
     }
-    return false;
+    return true;
 }
 
 bool
@@ -404,7 +404,7 @@ Ice::BlobjectAsync::_iceDispatch(Incoming& in, const Current& current)
 #else
     ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), vector<Byte>(inEncaps, inEncaps + sz), current);
 #endif
-    return true;
+    return false;
 }
 
 bool
@@ -426,5 +426,5 @@ Ice::BlobjectArrayAsync::_iceDispatch(Incoming& in, const Current& current)
 #else
     ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), inEncaps, current);
 #endif
-    return true;
+    return false;
 }
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index b09983d0f45..c8bd53530e6 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -3081,12 +3081,12 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
             {
                 C << nl << "inS.writeEmptyParams();";
             }
-            C << nl << "return false;";
+            C << nl << "return true;";
         }
         else
         {
             C << nl << "this->" << name << "_async" << argsAMD << ';';
-            C << nl << "return true;";
+            C << nl << "return false;";
         }
         C << eb;
     }
@@ -7144,7 +7144,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
                 C << nl << "inS.writeEmptyParams();";
             }
         }
-        C << nl << "return false;";
+        C << nl << "return true;";
     }
     else
     {
@@ -7164,7 +7164,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
             C << eb << ';';
         }
         C << nl << "this->" << opName << spar << args << epar << ';';
-        C << nl << "return true;";
+        C << nl << "return false;";
     }
     C << eb;
 }
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index ff344f57bf8..28d724f8646 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -1409,7 +1409,7 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe
             {
                 out << nl << "inS.writeEmptyParams();";
             }
-            out << nl << "return false;";
+            out << nl << "return true;";
 
             out << eb;
         }
@@ -1501,7 +1501,7 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe
                 out << ", ";
             }
             out << "current);";
-            out << nl << "return true;";
+            out << nl << "return false;";
 
             out << eb;
         }
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index ec263295058..bb1fe439030 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -192,21 +192,21 @@ ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& intercept
     test(interceptor->getLastOperation().empty());
     prx->ice_ping();
     test(interceptor->getLastOperation() == "ice_ping");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     string typeId = prx->ice_id();
     test(interceptor->getLastOperation() == "ice_id");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     test(prx->ice_isA(typeId));
     test(interceptor->getLastOperation() == "ice_isA");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     test(prx->add(33, 12) == 45);
     test(interceptor->getLastOperation() == "add");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing retry... " << flush;
     test(prx->addWithRetry(33, 12) == 45);
     test(interceptor->getLastOperation() == "addWithRetry");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing user exception... " << flush;
     try
@@ -219,7 +219,7 @@ ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& intercept
         // expected
     }
     test(interceptor->getLastOperation() == "badAdd");
-    test(!interceptor->getLastStatus());
+    test(interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing ONE... " << flush;
 
@@ -260,7 +260,7 @@ ClientApp::run(const Test::MyObjectPrxPtr& prx, const InterceptorIPtr& intercept
     cout << "testing simple AMD... " << flush;
     test(prx->amdAdd(33, 12) == 45);
     test(interceptor->getLastOperation() == "amdAdd");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
     cout << "ok" << endl;
 
     return EXIT_SUCCESS;
@@ -273,12 +273,12 @@ ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& int
     test(interceptor->getLastOperation().empty());
     test(prx->amdAdd(33, 12) == 45);
     test(interceptor->getLastOperation() == "amdAdd");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing retry... " << flush;
     test(prx->amdAddWithRetry(33, 12) == 45);
     test(interceptor->getLastOperation() == "amdAddWithRetry");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing user exception... " << flush;
     try
@@ -291,7 +291,7 @@ ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& int
         // expected
     }
     test(interceptor->getLastOperation() == "amdBadAdd");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
     cout << "ok" << endl;
     cout << "testing ONE... " << flush;
     interceptor->clear();
@@ -305,7 +305,7 @@ ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& int
         // expected
     }
     test(interceptor->getLastOperation() == "amdNotExistAdd");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
 
     test(dynamic_cast<Ice::ObjectNotExistException*>(interceptor->getException()) != 0);
 
@@ -326,7 +326,7 @@ ClientApp::runAmd(const Test::MyObjectPrxPtr& prx, const AMDInterceptorIPtr& int
         test(prx->ice_isCollocationOptimized());
     }
     test(interceptor->getLastOperation() == "amdBadSystemAdd");
-    test(interceptor->getLastStatus());
+    test(!interceptor->getLastStatus());
     test(dynamic_cast<MySystemException*>(interceptor->getException()) != 0);
     cout << "ok" << endl;
     return EXIT_SUCCESS;
diff --git a/java-compat/src/Ice/src/main/java/Ice/Blobject.java b/java-compat/src/Ice/src/main/java/Ice/Blobject.java
index d77f7e7a27a..fc0e797381c 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Blobject.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Blobject.java
@@ -46,6 +46,6 @@ public abstract class Blobject extends Ice.ObjectImpl
         inEncaps = in.readParamEncaps();
         boolean ok = ice_invoke(inEncaps, outEncaps, current);
         in.writeParamEncaps(outEncaps.value, ok);
-        return false;
+        return true;
     }
 }
diff --git a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
index 9eb908ae0d8..8bbb77e1d35 100644
--- a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
+++ b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java
@@ -42,6 +42,6 @@ public abstract class BlobjectAsync extends Ice.ObjectImpl
     {
         byte[] inEncaps = in.readParamEncaps();
         ice_invoke_async(new _AMD_Object_ice_invoke(in), inEncaps, current);
-        return true;
+        return false;
     }
 }
diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
index d80f1702d24..7942eb61159 100644
--- a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
+++ b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java
@@ -89,7 +89,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io
         OutputStream ostr = inS.startWriteParams();
         ostr.writeBool(ret);
         inS.endWriteParams();
-        return false;
+        return true;
     }
 
     /**
@@ -120,7 +120,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io
         inS.readEmptyParams();
         obj.ice_ping(current);
         inS.writeEmptyParams();
-        return false;
+        return true;
     }
 
     /**
@@ -156,7 +156,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io
         OutputStream ostr = inS.startWriteParams();
         ostr.writeStringSeq(ret);
         inS.endWriteParams();
-        return false;
+        return true;
     }
 
     /**
@@ -192,7 +192,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io
         OutputStream ostr = inS.startWriteParams();
         ostr.writeString(ret);
         inS.endWriteParams();
-        return false;
+        return true;
     }
 
     /**
diff --git a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
index 9629eca3392..5e04f23ebee 100644
--- a/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/interceptor/Client.java
@@ -36,22 +36,22 @@ public class Client extends test.Util.Application
         test(!interceptor.getLastStatus());
         prx.ice_ping();
         test(interceptor.getLastOperation().equals("ice_ping"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         String typeId = prx.ice_id();
         test(interceptor.getLastOperation().equals("ice_id"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         test(prx.ice_isA(typeId));
         test(interceptor.getLastOperation().equals("ice_isA"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         test(prx.add(33, 12) == 45);
         test(interceptor.getLastOperation().equals("add"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         out.println("ok");
         out.print("testing retry... ");
         out.flush();
         test(prx.addWithRetry(33, 12) == 45);
         test(interceptor.getLastOperation().equals("addWithRetry"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         out.println("ok");
         out.print("testing user exception... ");
         out.flush();
@@ -65,7 +65,7 @@ public class Client extends test.Util.Application
             // expected
         }
         test(interceptor.getLastOperation().equals("badAdd"));
-        test(!interceptor.getLastStatus());
+        test(interceptor.getLastStatus());
         out.println("ok");
         out.print("testing ONE... ");
         out.flush();
@@ -80,7 +80,6 @@ public class Client extends test.Util.Application
             // expected
         }
         test(interceptor.getLastOperation().equals("notExistAdd"));
-        test(!interceptor.getLastStatus());
         out.println("ok");
         out.print("testing system exception... ");
         out.flush();
@@ -103,14 +102,13 @@ public class Client extends test.Util.Application
             test(false);
         }
         test(interceptor.getLastOperation().equals("badSystemAdd"));
-        test(!interceptor.getLastStatus());
         out.println("ok");
 
         out.print("testing simple AMD... ");
         out.flush();
         test(prx.amdAdd(33, 12) == 45);
         test(interceptor.getLastOperation().equals("amdAdd"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         out.println("ok");
 
         return 0;
@@ -125,13 +123,13 @@ public class Client extends test.Util.Application
         test(!interceptor.getLastStatus());
         test(prx.amdAdd(33, 12) == 45);
         test(interceptor.getLastOperation().equals("amdAdd"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         out.println("ok");
         out.print("testing retry... ");
         out.flush();
         test(prx.amdAddWithRetry(33, 12) == 45);
         test(interceptor.getLastOperation().equals("amdAddWithRetry"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         out.println("ok");
         out.print("testing user exception... ");
         out.flush();
@@ -145,7 +143,7 @@ public class Client extends test.Util.Application
             // expected
         }
         test(interceptor.getLastOperation().equals("amdBadAdd"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         out.println("ok");
         out.print("testing ONE... ");
         out.flush();
@@ -160,7 +158,7 @@ public class Client extends test.Util.Application
             // expected
         }
         test(interceptor.getLastOperation().equals("amdNotExistAdd"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         test(interceptor.getException() instanceof Ice.ObjectNotExistException);
         out.println("ok");
         out.print("testing system exception... ");
@@ -184,7 +182,7 @@ public class Client extends test.Util.Application
             test(false);
         }
         test(interceptor.getLastOperation().equals("amdBadSystemAdd"));
-        test(interceptor.getLastStatus());
+        test(!interceptor.getLastStatus());
         test(interceptor.getException() instanceof MySystemException);
         out.println("ok");
         return 0;