perfsonar development work

Author: michael.bischoff
Date: 2008-03-05 14:34:47 -0500 (Wed, 05 Mar 2008)
New Revision: 3477

Modified:
   
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
Log:
RESOLVED - bug 261: FlowSA MA: raw flow aggregation does not work 
https://bugzilla.perfsonar.net/show_bug.cgi?id=261

Modified: 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
===================================================================
--- 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
    2008-03-05 19:05:29 UTC (rev 3476)
+++ 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
    2008-03-05 19:34:47 UTC (rev 3477)
@@ -367,5 +367,8 @@
                if(line.startsWith("Unknown aggregate field")) {
                        throw new IllegalAggregationRuleException(line);
                }
+               if(line.startsWith("Subnet specifier not allowed here: ")) {
+                       throw new IllegalAggregationRuleException(line);
+               }
        }
 }