Revision: 16677
http://sourceforge.net/p/gate/code/16677
Author: johann_p
Date: 2013-05-03 18:46:39 +0000 (Fri, 03 May 2013)
Log Message:
-----------
Correct bug in the processing of resourceshomedir when saving a controller,
remove
old debugging println.
Modified Paths:
--------------
gate/trunk/src/gate/util/persistence/PersistenceManager.java
Modified: gate/trunk/src/gate/util/persistence/PersistenceManager.java
===================================================================
--- gate/trunk/src/gate/util/persistence/PersistenceManager.java
2013-05-03 15:13:55 UTC (rev 16676)
+++ gate/trunk/src/gate/util/persistence/PersistenceManager.java
2013-05-03 18:46:39 UTC (rev 16677)
@@ -196,8 +196,7 @@
// is stored relative to $resourceshome$
// If URL can be made relative to both gatehome and projecthome,
// gatehome is preferred.
- if(currentUseGateHome() || currentWarnAboutGateHome()) {
-
+ if(currentUseGateHome() || currentWarnAboutGateHome()) {
if (!isContainedWithin(currentPersistenceFile(), gateHomePath) &&
isContainedWithin(urlPath, gateHomePath)) {
logger.debug("Setting path marker to "+gatehomePathMarker);
@@ -218,7 +217,7 @@
pathMarker = gatehomePathMarker;
}
} else if(resourceshomeDir != null &&
- isContainedWithin(currentPersistenceFile(),
resourceshomeDir) &&
+ !isContainedWithin(currentPersistenceFile(),
resourceshomeDir) &&
isContainedWithin(urlPath,resourceshomeDir)) {
if(currentWarnAboutGateHome()) {
if(!currentHaveWarnedAboutResourceshome().getValue()) {
@@ -336,7 +335,6 @@
resourceshomePath = new File(resourceshomeString);
resourceshomePath = getCanonicalFileIfPossible(resourceshomePath);
haveResourceshomePath = true;
- System.out.println("Found project home path "+resourceshomePath);
return resourceshomePath;
} else if(haveResourceshomePath) {
return resourceshomePath;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
