From 305446e7f3528c98e43d271c6621e4b10514e39d Mon Sep 17 00:00:00 2001 From: Mark Johnson Date: Sat, 26 Jan 2008 02:35:54 +0000 Subject: [PATCH] Temporarily disable locking in getdown --- .../threerings/getdown/data/Application.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/java/com/threerings/getdown/data/Application.java b/src/java/com/threerings/getdown/data/Application.java index 9d49399..5371c92 100644 --- a/src/java/com/threerings/getdown/data/Application.java +++ b/src/java/com/threerings/getdown/data/Application.java @@ -1032,6 +1032,7 @@ public class Application */ public synchronized boolean lockForUpdates () { + /* TEMP disable locking if (_lock != null && _lock.isValid()) { return true; } @@ -1049,6 +1050,8 @@ public class Application Log.logStackTrace(e); } return _lock != null; + */ + return true; } /** @@ -1056,6 +1059,7 @@ public class Application */ public synchronized void releaseLock () { + /* TEMP disable locking if (_lock != null) { try { _lock.release(); @@ -1072,6 +1076,7 @@ public class Application _lockChannel = null; _lock = null; } + */ } /** @@ -1083,9 +1088,9 @@ public class Application { downloadControlFile(Digest.DIGEST_FILE, true); } - + /** - * Downloads a new copy of the specified control file, optionally validating its signature. + * Downloads a new copy of the specified control file, optionally validating its signature. * If the download is successful, moves it over the old file on the filesystem. * *

We implement simple signing of the digest.txt file for use with the Getdown applet, but @@ -1162,7 +1167,7 @@ public class Application } } } - + // now move the temporary file over the original File original = getLocalPath(path); if (!FileUtil.renameTo(target, original)) { @@ -1170,7 +1175,7 @@ public class Application } } - /** + /** * Download a path to a temporary file, returning a {@link File} instance with the path * contents. */ @@ -1301,12 +1306,12 @@ public class Application protected ArrayList _appargs = new ArrayList(); protected Object[] _signers; - + /** If a warning has been issued about not being able to set modtimes. */ protected boolean _warnedAboutSetLastModified; - + protected static final String[] SA_PROTO = new String[0]; - + /** Locks gettingdown.lock in the app dir. Held the entire time updating is going on.*/ protected FileLock _lock;