From 2498d401eaedee5570c20eff797dee8415eccdf4 Mon Sep 17 00:00:00 2001 From: lresende Date: Sat, 2 Oct 2010 18:48:03 +0000 Subject: TUSCANY-3667 - Reverting usage of generics and just catching the exception to avoid performance implications on regular environments git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1003858 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/host/webapp/WebAppServletHost.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sca-java-2.x/branches/sca-java-2.0-M5/modules') diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-2.x/branches/sca-java-2.0-M5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java index caf7fc7942..3f14438c1f 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java @@ -20,6 +20,7 @@ package org.apache.tuscany.sca.host.webapp; import java.lang.reflect.Method; +import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; @@ -50,8 +51,6 @@ import org.apache.tuscany.sca.node.Node; public class WebAppServletHost implements ServletHost { private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); - private static final String INETADDRESS = "java.net.InetAddress"; - public static final String SCA_NODE_ATTRIBUTE = Node.class.getName(); private Map servlets; @@ -171,10 +170,7 @@ public class WebAppServletHost implements ServletHost { if (host == null) { try { //TUSCANY-3667 - InetAddress is not allowed in GoogleAppEngine - //host = InetAddress.getLocalHost().getHostName(); - Class clazz = Class.forName(INETADDRESS); - Object inetAddress = clazz.getMethod("getLocalHost").invoke(null); - host = (String) clazz.getMethod("getHostName").invoke(inetAddress); + host = InetAddress.getLocalHost().getHostName(); } catch (Throwable t) { logger.log(Level.WARNING, "Error retrieving host information : " + t.getMessage()); host = "localhost"; -- cgit v1.2.3