You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/01/31 08:39:05 UTC
svn commit: r617034 - in
/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server:
ServiceLogger.java ServiceManager.java
Author: dblevins
Date: Wed Jan 30 23:39:03 2008
New Revision: 617034
URL: http://svn.apache.org/viewvc?rev=617034&view=rev
Log:
Patch from Guillaume Nodet OPENEJB-748: Remove hard dependency on org.apache.log4j.MDC
Thanks, Guillaume!
Modified:
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Modified: openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java?rev=617034&r1=617033&r2=617034&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java (original)
+++ openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceLogger.java Wed Jan 30 23:39:03 2008
@@ -62,10 +62,13 @@
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 {
+ org.apache.log4j.MDC.put("HOST", client.getHostName());
+ org.apache.log4j.MDC.put("SERVER", getName());
+ } catch (Throwable e) {
+ }
try {
Modified: openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=617034&r1=617033&r2=617034&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Wed Jan 30 23:39:03 2008
@@ -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/");