svn commit: r1154051 - in /subversion/branches/1.7.x: ./ STATUS subversion/bindings/javahl/native/ClientContext.cpp

[hwright]

Author: hwright
Date: Fri Aug  5 00:36:55 2011
New Revision: 1154051

URL: http://svn.apache.org/viewvc?rev=1154051&view=rev
Log:
Merge r1154023 from trunk:

 * r1154023
   Improve working copy context lifetimes in JavaHL.
   Justification:
     Fixes problem in Subclipse with leaving SQLite handles open.
   Votes:
     +1: hwright, markphip

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    
subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  5 00:36:55 2011
@@ -54,4 +54,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152282,1152726,1153416,1153799,1153807,1153968
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152282,1152726,1153416,1153799,1153807,1153968,1154023

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154051&r1=1154050&r2=1154051&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug  5 00:36:55 2011
@@ -153,10 +153,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1154023
-   Improve working copy context lifetimes in JavaHL.
-   Justification:
-     Fixes problem in Subclipse with leaving SQLite handles open.
-   Votes:
-     +1: hwright, markphip

Modified: 
subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp?rev=1154051&r1=1154050&r2=1154051&view=diff
==============================================================================
--- 
subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp 
(original)
+++ 
subversion/branches/1.7.x/subversion/bindings/javahl/native/ClientContext.cpp 
Fri Aug  5 00:36:55 2011
@@ -95,6 +95,9 @@ ClientContext::~ClientContext()
 {
     delete m_prompter;
 
+    // close the sqlite databae
+    svn_error_clear(svn_wc_context_destroy(persistentCtx->wc_ctx));
+
     JNIEnv *env = JNIUtil::getEnv();
     env->DeleteGlobalRef(m_jctx);
 }