You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/05/29 04:57:05 UTC
svn commit: r1343456 - in
/subversion/branches/javahl-ra/subversion/bindings/javahl/native:
RevpropTable.cpp RevpropTable.h
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