Titan Server starts without specifying the rexster.xml file.

It will configure both http/rest and rexpro in this case.
w2ogroup · Mar 29, 2013 · 46314c6 · 46314c6
1 parent 0f970d5
commit 46314c6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/tinkerpop/rexster/RexsterTitanServer.java b/titan-core/src/main/java/com/thinkaurelius/titan/tinkerpop/rexster/RexsterTitanServer.java
@@ -53,11 +53,11 @@ public RexsterTitanServer(final XMLConfiguration rexsterConfig, final Configurat
         final boolean isRexProConfigured = rexsterConfig.subset("rexpro").getKeys().hasNext();
         final boolean isHttpConfigured = rexsterConfig.subset("http").getKeys().hasNext();
 
-        if (isRexProConfigured) {
+        if (isRexProConfigured || !isHttpConfigured) {
             rexProServer = new RexProRexsterServer(rexsterConfig);
         }
 
-        if (isHttpConfigured) {
+        if (isHttpConfigured || !isRexProConfigured) {
             // turn off dog house...always
             rexsterConfig.setProperty("http.enable-doghouse", false);
             httpServer = new HttpRexsterServer(rexsterConfig);