[virtualcommons-svn] SF.net SVN: virtualcommons:[452] csidex/trunk/src

[<al...@us...>]

Revision: 452
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=452&view=rev
Author:   alllee
Date:     2010-02-03 00:41:21 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
fixing http://opensource.asu.edu/jira/browse/COMMONS-15 - still needs more testing.

Modified Paths:
--------------
    csidex/trunk/src/main/java/edu/asu/commons/conf/ConfigurationAssistant.java
    csidex/trunk/src/main/java/edu/asu/commons/net/SocketIdentifier.java
    csidex/trunk/src/test/java/edu/asu/commons/conf/ConfigurationTest.java

Modified: csidex/trunk/src/main/java/edu/asu/commons/conf/ConfigurationAssistant.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/conf/ConfigurationAssistant.java	2010-02-03 00:29:53 UTC (rev 451)
+++ csidex/trunk/src/main/java/edu/asu/commons/conf/ConfigurationAssistant.java	2010-02-03 00:41:21 UTC (rev 452)
@@ -28,8 +28,8 @@
     
     private final Properties properties;
     
-    private final Configuration freemarkerConfiguration;
-    private final StringTemplateLoader templateLoader;
+    private transient Configuration freemarkerConfiguration;
+    private transient StringTemplateLoader templateLoader;
     
     public ConfigurationAssistant() {
         this(new Properties());

Modified: csidex/trunk/src/main/java/edu/asu/commons/net/SocketIdentifier.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/net/SocketIdentifier.java	2010-02-03 00:29:53 UTC (rev 451)
+++ csidex/trunk/src/main/java/edu/asu/commons/net/SocketIdentifier.java	2010-02-03 00:41:21 UTC (rev 452)
@@ -126,10 +126,10 @@
         StringTokenizer tokenizer = new StringTokenizer(remoteHostname, ".");
         String stationId = tokenizer.nextToken();
 
-        int startIndex = stationId.lastIndexOf("-");
+        int startIndex = stationId.lastIndexOf('-');
         String station = stationId.substring(startIndex + 1, stationId.length());
         try {
-            stationNumber = Math.abs(Integer.valueOf(station));
+            stationNumber = Math.abs(Integer.parseInt(station));
             stationed = true;
             return stationNumber;
         }
@@ -144,7 +144,13 @@
             return stationNumber.intValue();
         }
         String remoteHost = remoteSocketAddress.toString();
-        String lastIPDigits = remoteHost.substring(remoteHost.lastIndexOf(".") + 1, remoteHost.length());
+        /*
+        System.err.println("remote host name: "+  getRemoteHostName());
+        System.err.println("remote socket address: " + remoteSocketAddress);
+        System.err.println("local host name: " + getLocalHostName());
+        System.err.println("local host address: " + localSocketAddress);
+        */
+        String lastIPDigits = remoteHost.substring(remoteHost.lastIndexOf('.') + 1, remoteHost.lastIndexOf(':'));
         try {
             stationNumber = Math.abs(Integer.parseInt(lastIPDigits));
             stationed = true;

Modified: csidex/trunk/src/test/java/edu/asu/commons/conf/ConfigurationTest.java
===================================================================
--- csidex/trunk/src/test/java/edu/asu/commons/conf/ConfigurationTest.java	2010-02-03 00:29:53 UTC (rev 451)
+++ csidex/trunk/src/test/java/edu/asu/commons/conf/ConfigurationTest.java	2010-02-03 00:41:21 UTC (rev 452)
@@ -33,7 +33,7 @@
     
     @Test
     public void testTemplate() {
-        ServerConfiguration serverConfiguration = new ServerConfiguration();
+        //ServerConfiguration serverConfiguration = new ServerConfiguration();
 
         
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.