summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-GEIR-5ACC88A714\Administrator <Administrator@geir-5acc88a714.(none)>2008-08-22 15:06:24 -0400
committerU-GEIR-5ACC88A714\Administrator <Administrator@geir-5acc88a714.(none)>2008-08-22 15:06:24 -0400
commitb4d9b391a3c60915128ee544dba83d94925b5ad9 (patch)
tree3ff30502ea28967cd6eb05cd274ce3c299115b57
parent02bc370b37c695b4c78622d0ba9699d343b00a38 (diff)
downloadmongo-b4d9b391a3c60915128ee544dba83d94925b5ad9.tar.gz
javajs.cpp : if the appsrvpath is set on command line, respect it
-rw-r--r--db/javajs.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/db/javajs.cpp b/db/javajs.cpp
index 730bb8f29d2..7856b69d9f9 100644
--- a/db/javajs.cpp
+++ b/db/javajs.cpp
@@ -378,8 +378,14 @@ void jasserted(const char *msg, const char *file, unsigned line) {
const char* findEd(const char *path) {
#if defined(_WIN32)
- log() << " WIN32 default : c:/l/ed/" << endl;
- return "c:/l/ed";
+
+ if (!path) {
+ path = findEd();
+ }
+
+ // @TODO check validity
+
+ return path;
#else
if (!path) {