From 2ff4f8e2e8940b43d44ea41392ed220c84ac73c6 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 6 Apr 2001 18:02:08 +0000
Subject: [PATCH] Undo accidental check-in of some debugging changes

---
 src/helma/objectmodel/db/ApplicationManager.java | 2 +-
 src/helma/objectmodel/db/Server.java             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/helma/objectmodel/db/ApplicationManager.java b/src/helma/objectmodel/db/ApplicationManager.java
index 515bcdfd..b4872d6c 100644
--- a/src/helma/objectmodel/db/ApplicationManager.java
+++ b/src/helma/objectmodel/db/ApplicationManager.java
@@ -104,8 +104,8 @@ public class ApplicationManager {
 	try {
 	    IServer.getLogger().log ("Binding application "+appName);
 	    Application app = (Application) applications.get (appName);
-	        Naming.rebind ("//:"+port+"/"+appName, app);
 	    if (server.websrv == null) {
+	        Naming.rebind ("//:"+port+"/"+appName, app);
 	    } else {
 	        AcmeServletClient servlet = new AcmeServletClient (app);
 	        server.websrv.addServlet ("/"+appName+"/", servlet);
diff --git a/src/helma/objectmodel/db/Server.java b/src/helma/objectmodel/db/Server.java
index d9d1a0b6..a1ee1d94 100644
--- a/src/helma/objectmodel/db/Server.java
+++ b/src/helma/objectmodel/db/Server.java
@@ -198,10 +198,10 @@ import com.sleepycat.db.*;
 	        RMISocketFactory.setSocketFactory (factory);
 	    }
 
-	    // if (websrv == null) {
+	    if (websrv == null) {
 	        getLogger().log ("Starting server on port "+port);
 	        LocateRegistry.createRegistry (port);
-	    // }
+	    }
 
 
 	    // start application framework