[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1343456 - in /subversion/branches/javahl-ra/subversion/bindings/javahl/native: RevpropTable.cpp RevpropTable.h

From: Vladimir Berezniker <vladimir_at_berezniker.com>
Date: Mon, 28 May 2012 23:34:49 -0400

Hi Hyrum,

I committed JavaHL re-factoring changes in r1343452 and r1343456 thinking
that
while they are generally applicable to JavaHL code, they won't be used by
any
other JavaHL code, so they should go on the branch. But on a second thought
they are not tied to the new RA code, it just happens to be the only user at
the moment. Should I submit changes like these as patches against trunk to
@dev or continue committing them to javahl-ra branch?

Thank you in advance,

Vladimir

On Mon, May 28, 2012 at 11:22 PM, <commits-help_at_subversion.apache.org>wrote:

>
> Author: vmpn
> Date: Tue May 29 02:57:05 2012
> New Revision: 1343456
>
> URL: http://svn.apache.org/viewvc?rev=1343456&view=rev
> Log:
> On the javahl-ra branch:
>
> JavaHL: Support returning non const, empty rather than NULL hash as
> required
> by (svn_ra_get_commit_editor3) apr_hash_t *revprop_table parameter
>
> [ in subversion/bindings/javahl/native ]
>
> * RevpropTable.cpp,
> RevpropTable.h
> (hash): Removed const qualifier and added bool nullIfEmpty parameter to
> specify whether empty hash or NULL should be returned
>
> Modified:
>
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.cpp
>
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.h
>
> Modified:
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.cpp
> URL:
> http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.cpp?rev=1343456&r1=1343455&r2=1343456&view=diff
>
> ==============================================================================
> ---
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.cpp
> (original)
> +++
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.cpp
> Tue May 29 02:57:05 2012
> @@ -41,9 +41,9 @@ RevpropTable::~RevpropTable()
> JNIUtil::getEnv()->DeleteLocalRef(m_revpropTable);
> }
>
> -const apr_hash_t *RevpropTable::hash(const SVN::Pool &pool)
> +apr_hash_t *RevpropTable::hash(const SVN::Pool &pool, bool nullIfEmpty)
> {
> - if (m_revprops.size() == 0)
> + if (m_revprops.size() == 0 && nullIfEmpty)
> return NULL;
>
> apr_hash_t *revprop_table = apr_hash_make(pool.getPool());
>
> Modified:
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.h
> URL:
> http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.h?rev=1343456&r1=1343455&r2=1343456&view=diff
>
> ==============================================================================
> ---
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.h
> (original)
> +++
> subversion/branches/javahl-ra/subversion/bindings/javahl/native/RevpropTable.h
> Tue May 29 02:57:05 2012
> @@ -44,7 +44,7 @@ class RevpropTable
> public:
> RevpropTable(jobject jrevpropTable);
> ~RevpropTable();
> - const apr_hash_t *hash(const SVN::Pool &pool);
> + apr_hash_t *hash(const SVN::Pool &pool, bool nullIfEmpty = true);
> };
>
> #endif // REVPROPTABLE_H
>
>
>
>
>
Received on 2012-05-29 05:35:28 CEST

This is an archived mail posted to the Subversion Dev mailing list.