[tranche] r286 committed - Updated Tranche Commons JAR....

[tra...@googlecode.com]

Revision: 286
Author: augman85
Date: Wed Aug 11 12:13:53 2010
Log: Updated Tranche Commons JAR.
Removed configuration clear from configuration class.
Allow more leeway when publishing a passphrase.
http://code.google.com/p/tranche/source/detail?r=286

Modified:
/lib/tranche-commons.jar
/src/org/tranche/ConfigureTranche.java
/src/org/tranche/tasks/TaskUtil.java

=======================================
--- /lib/tranche-commons.jar Mon Aug 9 11:17:29 2010
+++ /lib/tranche-commons.jar Wed Aug 11 12:13:53 2010
Binary file, no diff available.
=======================================
--- /src/org/tranche/ConfigureTranche.java Mon May 10 20:55:34 2010
+++ /src/org/tranche/ConfigureTranche.java Wed Aug 11 12:13:53 2010
@@ -378,7 +378,6 @@
*/
public synchronized static void load(InputStream configFileStream) {
try {
- clear();
ConfigurationUtil.load(configFileStream);

// distribute
=======================================
--- /src/org/tranche/tasks/TaskUtil.java Tue Apr 27 10:26:55 2010
+++ /src/org/tranche/tasks/TaskUtil.java Wed Aug 11 12:13:53 2010
@@ -258,7 +258,7 @@

Collection<MultiServerRequestStrategy> updateStrategies =
MultiServerRequestStrategy.findFastestStrategiesUsingConnectedCoreServers(writableHostsToUse,
Tertiary.DONT_CARE, Tertiary.DONT_CARE);
if (updateStrategies.size() == 0) {
- throw new Exception("Could not find a strategy to propogate
to " + writableHostsToUse.size() + " server(s); cannot delete.");
+ throw new Exception("Could not find a strategy to propogate
to " + writableHostsToUse.size() + " server(s); cannot continue.");
}

out.println("Host(s) to use (writable, has appropriate hash
span): " + writableHostsToUse.size());
@@ -305,6 +305,11 @@
out.println();

boolean found = selectUploaderInMetaData(metaData, uploaderName,
relativePathInDataSet, uploadTimestamp);
+ // close enough if there is one uploader and it's the right name
+ if (!found && metaData.getUploaderCount() == 1) {
+ metaData.selectUploader(0);
+ found =
metaData.getSignature().getUserName().equals(uploaderName);
+ }
if (!found) {
throw new Exception("Could not find user information in meta
data, so cannot modify.");
}