Skip to content

Commit

Permalink
admin: Restore timeout semantics for pcells compatibility
Browse files Browse the repository at this point in the history
pcells relies on the classic cells behaviour of returning null
if a request timed out. This patch restores the classic behaviour.

Target: trunk
Request: 2.12
Request: 2.11
Request: 2.10
Require-notes: yes
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: https://rb.dcache.org/r/8002/
(cherry picked from commit 6db9956)
  • Loading branch information
gbehrmann committed Mar 23, 2015
1 parent d4eef4c commit 344cde7
Showing 1 changed file with 3 additions and 0 deletions.
Expand Up @@ -15,6 +15,7 @@
import java.util.concurrent.Executors;

import diskCacheV111.admin.UserAdminShell;
import diskCacheV111.util.TimeoutCacheException;

import dmg.cells.applets.login.DomainObjectFrame;
import dmg.cells.nucleus.CellEndpoint;
Expand Down Expand Up @@ -114,6 +115,8 @@ public void run()
in.close();
} catch (IOException ignored) {
}
} catch (TimeoutCacheException e) {
result = null;
} catch (Exception ae) {
result = ae;
}
Expand Down

0 comments on commit 344cde7

Please sign in to comment.