[Mxquery-commit] SF.net SVN: mxquery:[4308] trunk/MXQuery

[<pm_...@us...>]

Revision: 4308
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4308&view=rev
Author:   pm_fischer
Date:     2011-05-03 13:24:45 +0000 (Tue, 03 May 2011)

Log Message:
-----------
- only copy anonymous updateable stores. When named, keep a single
instance

Modified Paths:
--------------
    trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java
    trunk/MXQuery_Testing/src/ch/ethz/mxquery/testsuite/TestSuiteUpdate.java

Modified: trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java
===================================================================
--- trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java	2011-05-03 09:46:28 UTC (rev 4307)
+++ trunk/MXQuery/src/ch/ethz/mxquery/update/store/llImpl/LLStore.java	2011-05-03 13:24:45 UTC (rev 4308)
@@ -1188,10 +1188,13 @@
 	}
 	
 	public Source copySource(Context ctx, Vector nestedPredCtxStack) throws MXQueryException {
-	    if (uri == null || uri.startsWith("SimpleStore_"))
+	    if (uri == null || uri.startsWith("SimpleStore_")) {
 		uri = "SimpleStore_"
 			+ Integer.toString(++storeSet.urilessCounter);
 		return new LLStore(uri, storeSet,initialSource.copy(ctx, null, false, nestedPredCtxStack));
+	    } else {
+		return this;
+	    }
 	}
 
 	public boolean isModified() {

Modified: trunk/MXQuery_Testing/src/ch/ethz/mxquery/testsuite/TestSuiteUpdate.java
===================================================================
--- trunk/MXQuery_Testing/src/ch/ethz/mxquery/testsuite/TestSuiteUpdate.java	2011-05-03 09:46:28 UTC (rev 4307)
+++ trunk/MXQuery_Testing/src/ch/ethz/mxquery/testsuite/TestSuiteUpdate.java	2011-05-03 13:24:45 UTC (rev 4308)
@@ -637,7 +637,7 @@
 							}
 					}					
 					
-					boolean resetFiles = false;
+					boolean resetFiles = true;
 					if (resetFiles) {
 						SVNWCClient svnClient = new SVNWCClient((ISVNAuthenticationManager)null,null);
 						try {
@@ -701,7 +701,7 @@
 							}
 					}					
 
-					boolean resetFiles = false;
+					boolean resetFiles = true;
 					if (resetFiles) {
 						SVNWCClient svnClient = new SVNWCClient((ISVNAuthenticationManager)null,null);
 						try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.