From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 11 Sep 2010 19:26:11 +0000 (+0200)
Subject: Moved the SCGI storage root default into Environment.
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=ca735b1ffb58436bbd0ab9855625560c28f21424;p=jsvc.git

Moved the SCGI storage root default into Environment.
---

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 {