svn commit: r1004719 - in /synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix: FIXIncomingMessageHandler.java FIXSessionFactory.java FIXUtils.java

[hiranya]

Author: hiranya
Date: Tue Oct  5 17:16:12 2010
New Revision: 1004719

URL: http://svn.apache.org/viewvc?rev=1004719&view=rev
Log:
Minor refactoring in FIX transport


Modified:
    
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
    
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
    
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java

Modified: 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java?rev=1004719&r1=1004718&r2=1004719&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
 (original)
+++ 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXIncomingMessageHandler.java
 Tue Oct  5 17:16:12 2010
@@ -311,6 +311,9 @@ public class FIXIncomingMessageHandler i
                     
msgCtx.setAxisMessage(operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE));
                     msgCtx.setSoapAction("urn:" + 
operation.getName().getLocalPart());
                 }
+            } else {
+                log.warn("Service information not available for the FIX 
message processor");
+                return;
             }
 
             String fixApplication = FIXConstants.FIX_INITIATOR;

Modified: 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java?rev=1004719&r1=1004718&r2=1004719&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
 (original)
+++ 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXSessionFactory.java
 Tue Oct  5 17:16:12 2010
@@ -34,7 +34,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -180,9 +179,9 @@ public class FIXSessionFactory {
         }
 
         Hashtable<String,String> properties = 
BaseUtils.getEPRProperties(fixEPR);
-        for (String key : properties.keySet()) {
-            settings.setString(sessionID, key, properties.get(key));
-        }        
+        for (Map.Entry<String,String> entry : properties.entrySet()) {
+            settings.setString(sessionID, entry.getKey(), entry.getValue());
+        }
 
         String[] socketAddressElements = 
FIXUtils.getSocketAddressElements(fixEPR);
         settings.setString(sessionID, FIXConstants.CONNECTION_TYPE, 
FIXConstants.FIX_INITIATOR);

Modified: 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java?rev=1004719&r1=1004718&r2=1004719&view=diff
==============================================================================
--- 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
 (original)
+++ 
synapse/branches/2.0/modules/transports/optional/fix/src/main/java/org/apache/synapse/transport/fix/FIXUtils.java
 Tue Oct  5 17:16:12 2010
@@ -552,13 +552,13 @@ public class FIXUtils {
         } else {
             Hashtable<String,String> properties1 = 
BaseUtils.getEPRProperties(url1);
             Hashtable<String, String> properties2 = 
BaseUtils.getEPRProperties(url2);
-            for (String key : properties1.keySet()) {
-                if (!properties2.containsKey(key)) {
+            for (Map.Entry<String,String> entry : properties1.entrySet()) {
+                if (!properties2.containsKey(entry.getKey())) {
                     return false;
-                } else if (!properties1.get(key).equals(properties2.get(key))) 
{
+                } else if 
(!properties1.get(entry.getKey()).equals(entry.getValue())) {
                     return false;
                 }
-            }                        
+            }
         }
         return true;
     }