Changeset 25747 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

Timestamp:

2012-06-05T15:39:17+12:00 (12 years ago)

Author:

sjm84

Message:

Some tidying

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -19 +19 @@
 package org.greenstone.gsdl3.core;
 
-import org.greenstone.util.GlobalProperties;
-import org.greenstone.gsdl3.util.*;
-import org.greenstone.gsdl3.service.*;
-import org.greenstone.gsdl3.comms.*;
-import org.greenstone.gsdl3.collection.*;
-
-// XML classes
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import javax.xml.parsers.*;
-
-// other java classes
 import java.io.File;
-import java.io.Reader;
-import java.io.StringReader;
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.log4j.*;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.collection.Collection;
+import org.greenstone.gsdl3.collection.ServiceCluster;
+import org.greenstone.gsdl3.comms.Communicator;
+import org.greenstone.gsdl3.comms.SOAPCommunicator;
+import org.greenstone.gsdl3.service.ServiceRack;
+import org.greenstone.gsdl3.util.GSFile;
+import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.OAIXML;
+import org.greenstone.gsdl3.util.UserContext;
+import org.greenstone.gsdl3.util.XMLConverter;
+import org.greenstone.util.GlobalProperties;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
@@ -305 +302 @@
                 // separated list in the 'to' attribute
                 String[] modules = StringUtils.split(path, ",");
-
-                for (int j = 0; j < modules.length; j++)
+                
+                for (String this_mod : modules)
                 {
                     // why can't we do this outside the loop??
@@ -313 +310 @@
                     mess.appendChild(copied_request);
 
-                    String this_mod = modules[j];
                     // find the module to pass it on to
                     // need to put the request into a message element
@@ -322 +318 @@
                         copied_request.setAttribute(GSXML.TO_ATT, this_mod);
                         result = this.module_map.get(obj).process(mess);
+                        
                         if (result != null)
                         {
@@ -329 +326 @@
                             {
                                 mainResult.appendChild(this.doc.importNode(res, true));
-
                             }
                         }
@@ -340 +336 @@
                             logger.error("MessageRouter Error: request had null result!");
                         }
-
                     }
                     else