You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/08/30 16:39:59 UTC
[30/52] [abbrv] oodt git commit: Merge branch
'feature/zookeeper-config' of https://github.com/IMS94/oodt into
feature/zookeeper-config
Merge branch 'feature/zookeeper-config' of https://github.com/IMS94/oodt into feature/zookeeper-config
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/b357f4b9
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b357f4b9
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b357f4b9
Branch: refs/heads/master
Commit: b357f4b97cc6797ae0a2d5a6c1d06582325fdfbb
Parents: e481b0b daf555c
Author: Chris Mattmann <ma...@apache.org>
Authored: Fri Jul 14 11:45:05 2017 -0700
Committer: Chris Mattmann <ma...@apache.org>
Committed: Fri Jul 14 11:45:05 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/oodt/config/Component.java | 4 ++--
.../distributed/DistributedConfigurationManager.java | 1 +
.../oodt/config/distributed/utils/FilePathUtils.java | 6 ++++--
.../DistributedConfigurationManagerTest.java | 15 +++++++++------
4 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/b357f4b9/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java
----------------------------------------------------------------------
diff --cc config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java
index 975a062,d03f11a..08ecdc1
--- a/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java
+++ b/config/src/test/java/org/apache/oodt/config/distributed/DistributedConfigurationManagerTest.java
@@@ -94,10 -88,10 +94,11 @@@ public class DistributedConfigurationMa
Assert.assertEquals(properties.getProperty(key), System.getProperty(key));
}
- String fileName = FilePathUtils.fixForComponentHome(publisher.getComponent(), entry.getValue());
- fileName = fileName.startsWith(SEPARATOR) ? fileName.substring(1) : fileName;
+ String fileName = entry.getValue();
+ fileName = fileName.startsWith(SEPARATOR) ? fileName.substring(SEPARATOR.length()) : fileName;
+ fileName = FilePathUtils.fixForComponentHome(publisher.getComponent(), fileName);
File downloadedFile = new File(fileName);
+ Assert.assertNotNull(downloadedFile);
Assert.assertTrue(downloadedFile.exists());
}