perfsonar development work

Author: joost
Date: 2007-02-12 10:24:49 -0500 (Mon, 12 Feb 2007)
New Revision: 2056

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
Log:
Minor issues

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
   2007-02-12 13:31:54 UTC (rev 2055)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ConfigFileWriter.java
   2007-02-12 15:24:49 UTC (rev 2056)
@@ -123,6 +123,8 @@
                ConfigurationComponent configuration = 
(ConfigurationComponent) AuxiliaryComponentManager
                                
.getInstance().getComponent(ComponentNames.CONFIG);
 
+               logger.debug("FlowTypeMpServiceEngine -> ConfigFileWriter: 
cleanUp call");
+               
                String configBasePath = configuration
                                .getProperty("service.mp.flow.client_dir");
                Integer maxConn = Integer.parseInt(configuration

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java
    2007-02-12 13:31:54 UTC (rev 2055)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/FlowTypeMPServiceEngine.java
    2007-02-12 15:24:49 UTC (rev 2056)
@@ -321,11 +321,6 @@
                        Integer key = 
ZebedeeControl.getInstance().startTunnel(
                                        
params.get(FlowTypeConstants.KEY_CLIENT_ADDRESS), portNr);
                        
-                       //check for max clients reached
-                       if(key == -1) {
-                               throw new 
SystemException("error.mp.flow.max_clients_reached","The maximum number of 
clients is reached, try again later.");
-                       }
-                       
                        ConfigFileWriter.save(key, params, routers);
 
                        return 
createResponse(FlowTypeConstants.FLOW_SUBSCRIBE_RESPONSE,

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
     2007-02-12 13:31:54 UTC (rev 2055)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/flowType/ZebedeeControl.java
     2007-02-12 15:24:49 UTC (rev 2056)
@@ -167,6 +167,11 @@
                // Get a new unique key
                Integer key = newKey();
 
+               //check for max clients reached
+               if(key == -1) {
+                       throw new 
SystemException("error.mp.flow.max_clients_reached","The maximum number of 
clients is reached, try again later.");
+               }
+               
                logger.debug("ZebedeeControl: starting tunnel with key " + 
key + ".");
 
                // get the commandline options formatted.