Author: philip
Date: Mon May  9 18:01:59 2011
New Revision: 1101126

URL: http://svn.apache.org/viewvc?rev=1101126&view=rev
Log:
* subversion/libsvn_ra_neon/commit.c
  (commit_open_root): Use VTXN stubs with VTXN name.

Modified:
    subversion/trunk/subversion/libsvn_ra_neon/commit.c

Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1101126&r1=1101125&r2=1101126&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Mon May  9 18:01:59 2011
@@ -782,19 +782,27 @@ static svn_error_t * commit_open_root(vo
       /* Check the response headers for either the virtual transaction
          details, or the real transaction details.  We need to have
          one or the other of those!  */
-      header_val = ne_get_response_header(req->ne_req,
-                                          SVN_DAV_VTXN_NAME_HEADER);
-      if (! header_val)
-        header_val = ne_get_response_header(req->ne_req,
-                                            SVN_DAV_TXN_NAME_HEADER);
-      if (! header_val)
+      if ((header_val = ne_get_response_header(req->ne_req,
+                                               SVN_DAV_VTXN_NAME_HEADER)))
+        {
+          cc->txn_url = svn_path_url_add_component2(cc->ras->vtxn_stub,
+                                                    header_val, cc->pool);
+          cc->txn_root_url
+            = svn_path_url_add_component2(cc->ras->vtxn_root_stub,
+                                          header_val, cc->pool);
+        }
+      else if ((header_val = ne_get_response_header(req->ne_req,
+                                                    SVN_DAV_TXN_NAME_HEADER)))
+        {
+          cc->txn_url = svn_path_url_add_component2(cc->ras->txn_stub,
+                                                    header_val, cc->pool);
+          cc->txn_root_url = 
svn_path_url_add_component2(cc->ras->txn_root_stub,
+                                                         header_val, cc->pool);
+        }
+      else
         return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
                                  _("POST request did not return transaction "
                                    "information"));
-      cc->txn_url = svn_path_url_add_component2(cc->ras->txn_stub,
-                                                header_val, cc->pool);
-      cc->txn_root_url = svn_path_url_add_component2(cc->ras->txn_root_stub,
-                                                     header_val, cc->pool);
 
       root->rsrc = NULL;
       root->txn_root_url = svn_path_url_add_component2(cc->txn_root_url,


Reply via email to