perfsonar development work

Author: michael.bischoff
Date: 2008-06-16 13:49:59 -0400 (Mon, 16 Jun 2008)
New Revision: 4014

Modified:
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
   
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
Log:
fixing pmd and findbugs warnings

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
     2008-06-16 14:23:08 UTC (rev 4013)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/FlowMpRequest.java
     2008-06-16 17:49:59 UTC (rev 4014)
@@ -157,20 +157,15 @@
         *             if the key is not properly formatted, or does not 
exist.
         */
        private Integer filterKey(Message request) throws PerfSONARException {
-               // search for a metadata element
                for (Metadata meta : request.getMetadataArray()) {
-                       // with a key element
-                       if (meta.getKey() != null) {
-                               // that has a
-                               if 
(meta.getKey().getParameterByName("maSubscription") != null) {
-                                       Parameter param = 
meta.getKey().getParameterByName(KEY_SUBSCRIPTION);
-                                       if (param != null && 
param.getParameterValue() != null) {
-                                               Integer keyFromParameters = 
new Integer(param.getParameterValue());
-                                               if 
(keyFromParameters.intValue() > 0) {
-                                                       return 
keyFromParameters;
-                                               }
-                                               throw new 
PerfSONARException("Key is not positive numeric.");
+                       if (meta.getKey() != null && 
meta.getKey().getParameterByName("maSubscription") != null) {
+                               Parameter param = 
meta.getKey().getParameterByName(KEY_SUBSCRIPTION);
+                               if (param != null && 
param.getParameterValue() != null) {
+                                       Integer keyFromParameters = new 
Integer(param.getParameterValue());
+                                       if (keyFromParameters.intValue() > 0) 
{
+                                               return keyFromParameters;
                                        }
+                                       throw new PerfSONARException("Key is 
not positive numeric.");
                                }
                        }
                }
@@ -184,7 +179,6 @@
        public List<String> getRouters() {
                return Collections.unmodifiableList(routers);
        }
-
        
        public String getFilter() {
                return params.get("filter");

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-06-16 14:23:08 UTC (rev 4013)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/NfReplayControll.java
  2008-06-16 17:49:59 UTC (rev 4014)
@@ -98,10 +98,8 @@
                
                protected File getRouterDirectory(String routerName) throws 
PerfSONARException {
                        File directory = new 
File(nfcapTargetDirectory,routerName + "/");
-                       if(!directory.exists()) {
-                               if(!directory.mkdir()) {
+                       if(!directory.exists() && !directory.mkdir()) {
                                        throw new 
PerfSONARException("","Could not create a router directory");
-                               }
                        }
                        return directory;
                }               

Modified: 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
       2008-06-16 14:23:08 UTC (rev 4013)
+++ 
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/SubscriptionService.java
       2008-06-16 17:49:59 UTC (rev 4014)
@@ -170,7 +170,7 @@
                                                
                        synchronized (subscriptions) {
                                subscriptions.putIfAbsent(id, 
newSubscription);
-                               subscriptions.notify();
+                               subscriptions.notifyAll();
                        }
                        return newSubscription;
                }