[Swift-commit] r2167 - provider-deef/src/org/globus/cog/abstraction/impl/execution/deef

[noreply at svn.ci.uchicago.edu]

Author: wilde
Date: 2008-07-31 17:38:27 -0500 (Thu, 31 Jul 2008)
New Revision: 2167

Modified:
   provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/ResourcePool.java
Log:
Remove old commented-out methods from prior testing

Modified: provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/ResourcePool.java
===================================================================
--- provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/ResourcePool.java	2008-07-31 15:34:35 UTC (rev 2166)
+++ provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/ResourcePool.java	2008-07-31 22:38:27 UTC (rev 2167)
@@ -218,45 +218,6 @@
 	*/
     }
 
-    public static String getMachNamePort__ORIG__(Notification userNot){
-        String machName = "";
-        //String machIP;
-        try {
-	    machName = java.net.InetAddress.getLocalHost().getCanonicalHostName();
-	    machName = machName +  ":" + userNot.recvPort;
-	    //machIP = java.net.InetAddress.getLocalHost().getHostAddress();
-	    logger.debug("WORKER: Machine ID = " + machName);
-
-        } catch (Exception e) {
-            logger.error("WORKER: ERROR: java.net.InetAddress.getLocalHost().getHostName() failed " + e);
-        }
-	return machName;
-    }
-
-/**** From Ioan:
-   public String getMachNamePort__IOANS_EMAIL__(int recvPort)
-   {
-       String machName = new String("localhost:"+recvPort);
-       try
-       {
-           String method = new String("overide");
-           if (NOTIFICATION_ENDPOINT == null)
-           {
-               NOTIFICATION_ENDPOINT = java.net.InetAddress.getLocalHost().getCanonicalHostName();
-               method = new String("automatic");
-           }
-           machName = NOTIFICATION_ENDPOINT +  ":" + recvPort;
-           System.out.println("Notification Endpoint (" + method + "): " + NOTIFICATION_ENDPOINT);
-       }
-       catch (Exception e)
-       {
-           System.out.println("WORKER: ERROR: java.net.InetAddress.getLocalHost().getHostName() failed " + e);
-           if (DEBUG) e.printStackTrace();
-       }
-       return machName;
-   }
-****/
-
     public static String getMachNamePort(Notification userNot){
         //String machIP = VDL2Config.getIP();
 	String machIP = CoGProperties.getDefault().getIPAddress();