Author: stefan2
Date: Mon Aug 18 12:45:41 2014
New Revision: 1618592
URL: http://svn.apache.org/r1618592
Log:
On the Merge 1.8.x-r1611379 branch: Merge r1617687 from /trunk.
There were no conflicts.
Modified:
subversion/branches/1.8.x-r1611379/ (props changed)
subversion/branches/1.8.x-r1611379/subversion/libsvn_subr/named_atomic.c
Propchange: subversion/branches/1.8.x-r1611379/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1617687
Modified:
subversion/branches/1.8.x-r1611379/subversion/libsvn_subr/named_atomic.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1611379/subversion/libsvn_subr/named_atomic.c?rev=1618592&r1=1618591&r2=1618592&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1611379/subversion/libsvn_subr/named_atomic.c
(original)
+++ subversion/branches/1.8.x-r1611379/subversion/libsvn_subr/named_atomic.c
Mon Aug 18 12:45:41 2014
@@ -444,17 +444,21 @@ svn_atomic_namespace__create(svn_atomic_
* with our data file)
*/
if (new_ns->data->count > MAX_ATOMIC_COUNT)
- return svn_error_create(SVN_ERR_CORRUPTED_ATOMIC_STORAGE, 0,
- _("Number of atomics in namespace is too large."));
-
- /* Cache the number of existing, complete entries. There can't be
- * incomplete ones from other processes because we hold the mutex.
- * Our process will also not access this information since we are
- * either being called from within svn_atomic__init_once or by
- * svn_atomic_namespace__create for a new object.
- */
- new_ns->min_used = new_ns->data->count;
- *ns = new_ns;
+ {
+ err = svn_error_create(SVN_ERR_CORRUPTED_ATOMIC_STORAGE, 0,
+ _("Number of atomics in namespace is too large."));
+ }
+ else
+ {
+ /* Cache the number of existing, complete entries. There can't be
+ * incomplete ones from other processes because we hold the mutex.
+ * Our process will also not access this information since we are
+ * either being called from within svn_atomic__init_once or by
+ * svn_atomic_namespace__create for a new object.
+ */
+ new_ns->min_used = new_ns->data->count;
+ *ns = new_ns;
+ }
}
/* Unlock to allow other processes may access the shared memory as well.
