[Pkg-corba-commits] r225 - in /trunk/omniorb/debian/patches: klotz series

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Wed Feb  2 22:31:29 2011
New Revision: 225

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=225
Log:
Add bugfix for 4.1.4 which was posted and acknowledged on the mailing
list.

Added:
    trunk/omniorb/debian/patches/klotz
Modified:
    trunk/omniorb/debian/patches/series

Added: trunk/omniorb/debian/patches/klotz
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/klotz?rev=225&op=file
==============================================================================
--- trunk/omniorb/debian/patches/klotz (added)
+++ trunk/omniorb/debian/patches/klotz Wed Feb  2 22:31:29 2011
@@ -1,0 +1,46 @@
+Description: Add missing else statement
+ The attached patch (against SVN trunk) adds an "else" statement that
+ in our opinion got lost in omniORB 4.1.4 in this checkin (file
+ omniObjRef.cc):
+ .
+  Revision 1.4.2.7  2008/10/28 15:54:51  dgrisby
+  Internal CommFailure exception escapes after failed-on-forward call
+  that is not retried.
+ .
+ There were two identical code blocks in omniORB 4.1.3 that were
+ altered by the above checkin. In omniORB 4.1.4 a diff shows that the
+ "else" statement misses in one of the blocks.
+ .
+ The erroneous behavior we are seeing is this:
+ .
+ * Client contacts Naming Service and establishes a connection
+ * Later the Naming Service closes the connection due to its
+   inConScanPeriod setting
+ * Client contacts Naming Service again before its outConScanPeriod is
+   over
+ * Client sees the dead connection but instead of performing a retry it
+ immediately throws a COMM_FAILURE exception
+ .
+ omniORB 4.1.3 and patched 4.1.4 clients work as expected and open a
+ new connection to the Naming Service.
+Forwarded: http://www.omniorb-support.com/pipermail/omniorb-list/2010-July/030686.html
+Author: Peter Klotz <peter.klotz at aon.at>
+
+--- a/src/lib/omniORB/orbcore/omniObjRef.cc
++++ b/src/lib/omniORB/orbcore/omniObjRef.cc
+@@ -1116,6 +1116,7 @@
+       if (ex.retry()) {
+ 	required_retry = 1;
+       }
++      else {
+       if (fwd) {
+ 	omni::revertToOriginalProfile(this);
+ 	CORBA::TRANSIENT ex2(TRANSIENT_FailedOnForwarded, ex.completed());
+@@ -1136,6 +1137,7 @@
+ 	if (!_omni_callTransientExceptionHandler(this, retries++, ex2))
+ 	  OMNIORB_THROW(TRANSIENT,ex.minor(),ex.completed());
+       }
++      }
+     }
+     catch(CORBA::COMM_FAILURE& ex) {
+       if( fwd ) {

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=225&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Wed Feb  2 22:31:29 2011
@@ -4,3 +4,4 @@
 cos_stubs
 string_exceptions
 missing_cos_linking
+klotz