From 7f4f5d6a9cb16a9dbcd2bae49bdbd1bc1f13dc34 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sun, 12 Sep 2010 02:28:16 +0200 Subject: [PATCH] Revert "Moved the SCGI storage root default into Environment." This reverts commit ca735b1ffb58436bbd0ab9855625560c28f21424, since the code didn't respect context names with that. --- src/dolda/jsvc/scgi/DSContext.java | 4 ++++ src/dolda/jsvc/scgi/Environment.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dolda/jsvc/scgi/DSContext.java b/src/dolda/jsvc/scgi/DSContext.java index 350e1c5..c726887 100644 --- a/src/dolda/jsvc/scgi/DSContext.java +++ b/src/dolda/jsvc/scgi/DSContext.java @@ -37,6 +37,10 @@ public class DSContext extends SimpleContext { } private void loadconfig() { + if(env.root != null) { + File sroot = new File(new File(env.root, "store"), name()); + sysconfig.put("jsvc.storage", "file:" + sroot.getPath()); + } sysconfig.putAll(env.sysconfig); } diff --git a/src/dolda/jsvc/scgi/Environment.java b/src/dolda/jsvc/scgi/Environment.java index b2f85bf..e91f57a 100644 --- a/src/dolda/jsvc/scgi/Environment.java +++ b/src/dolda/jsvc/scgi/Environment.java @@ -27,8 +27,6 @@ public class Environment { } private void loadconfig() { - File sroot = new File(root, "store"); - sysconfig.put("jsvc.storage", "file:" + sroot.getPath()); File conf = new File(root, "jsvc.properties"); if(conf.exists()) { try { -- 2.11.0