Index: container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java
===================================================================
--- container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java	(revision 615244)
+++ container/openejb-core/src/main/java/org/apache/openejb/config/sys/PropertiesAdapter.java	(working copy)
@@ -17,8 +17,11 @@
  */
 package org.apache.openejb.config.sys;
 
+<<<<<<< .mine
+=======
 import org.apache.openejb.util.SuperProperties;
 
+>>>>>>> .r615244
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
Index: server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java
===================================================================
--- server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java	(revision 615244)
+++ server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java	(working copy)
@@ -63,9 +63,12 @@
     
     public void service(Socket socket) throws ServiceException, IOException {
 
-        InetAddress client = socket.getInetAddress();
-        org.apache.log4j.MDC.put("HOST", client.getHostName());
-        org.apache.log4j.MDC.put("SERVER", getName());
+        try {
+            InetAddress client = socket.getInetAddress();
+            org.apache.log4j.MDC.put("HOST", client.getHostName());
+            org.apache.log4j.MDC.put("SERVER", getName());
+        } catch (Throwable e) {
+        }
 
         try {
 
Index: server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
===================================================================
--- server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java	(revision 615244)
+++ server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java	(working copy)
@@ -135,7 +135,7 @@
             org.apache.log4j.MDC.put("SERVER", "main");
             InetAddress localhost = InetAddress.getLocalHost();
             org.apache.log4j.MDC.put("HOST", localhost.getHostName());
-        } catch (Exception e) {
+        } catch (Throwable e) {
         }
 
         ServiceFinder serviceFinder = new ServiceFinder("META-INF/");