perfsonar development work

Author: michael.bischoff
Date: 2008-10-07 03:02:10 -0400 (Tue, 07 Oct 2008)
New Revision: 4592

Modified:
   
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
Log:
Added checks for nfdump executables being correct.

Modified: 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-07 06:54:03 UTC (rev 4591)
+++ 
trunk/ps-mdm-flowsub-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
 2008-10-07 07:02:10 UTC (rev 4592)
@@ -324,8 +324,11 @@
                        logger.debug("Creating NfReplay controll");
                        
                        nfcapdExecutable = 
configuration.getProperty("service.mp.flow.nfcapd");
+                       checkCanExecute(nfcapdExecutable, "Nfcapd");
                        nfreplayExecutable = 
configuration.getProperty("service.mp.flow.nfreplay");
+                       checkCanExecute(nfreplayExecutable, "Nfreplay");
                        nfdumpExecutable = 
configuration.getProperty("service.mp.flow.nfdump");
+                       checkCanExecute(nfdumpExecutable, "Nfdump");
                        nfcapTargetDirectory = 
AuxiliaryComponentManager.getInstance().getTempDirectory();
                        
                        for(int i = 0; ;i++) {
@@ -343,6 +346,12 @@
                }               
        }
        
+       private void checkCanExecute(String path, String name) throws 
PerfSONARException {
+               if(!new File(path).canExecute()) {
+                       throw new 
PerfSONARException("error.ma.configuration",name+" executable doesn't exist 
or the program is not allow to execute it.");
+               }
+       }
+
        private void initExportingRouter(int i) throws PerfSONARException {
                String enabled = 
configuration.getProperty(EXPORTER_FIRST_PART+i+".enabled");
                if(!enabled.equalsIgnoreCase("true")) return;