From ca735b1ffb58436bbd0ab9855625560c28f21424 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sat, 11 Sep 2010 21:26:11 +0200 Subject: [PATCH] Moved the SCGI storage root default into Environment. --- src/dolda/jsvc/scgi/DSContext.java | 4 ---- src/dolda/jsvc/scgi/Environment.java | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dolda/jsvc/scgi/DSContext.java b/src/dolda/jsvc/scgi/DSContext.java index c726887..350e1c5 100644 --- a/src/dolda/jsvc/scgi/DSContext.java +++ b/src/dolda/jsvc/scgi/DSContext.java @@ -37,10 +37,6 @@ 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 e91f57a..b2f85bf 100644 --- a/src/dolda/jsvc/scgi/Environment.java +++ b/src/dolda/jsvc/scgi/Environment.java @@ -27,6 +27,8 @@ 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